diff --git a/components/isceobj/TopsProc/runComputeBaseline.py b/components/isceobj/TopsProc/runComputeBaseline.py
index 7aa0eb9..970084d 100644
--- a/components/isceobj/TopsProc/runComputeBaseline.py
+++ b/components/isceobj/TopsProc/runComputeBaseline.py
@@ -77,6 +77,8 @@ def runComputeBaseline(self):
                     mxyz = np.array(masterSV.getPosition())
                     mvel = np.array(masterSV.getVelocity())
                     sxyz = np.array(slaveSV.getPosition())
+                    mvelunit = mvel / np.linalg.norm(mvel)
+                    sxyz = sxyz - np.dot ( sxyz-mxyz, mvelunit) * mvelunit
 
                     aa = np.linalg.norm(sxyz-mxyz)
                     costheta = (rng*rng + aa*aa - slvrng*slvrng)/(2.*rng*aa)
diff --git a/components/zerodop/baseline/Baseline.py b/components/zerodop/baseline/Baseline.py
index b26c74d..8b2b7b0 100755
--- a/components/zerodop/baseline/Baseline.py
+++ b/components/zerodop/baseline/Baseline.py
@@ -103,6 +103,8 @@ class Baseline(Component):
             mxyz = np.array(masterSV.getPosition())
             mvel = np.array(masterSV.getVelocity())
             sxyz = np.array(slaveSV.getPosition())
+            mvelunit = mvel / np.linalg.norm(mvel)
+            sxyz = sxyz - np.dot ( sxyz-mxyz, mvelunit) * mvelunit
 
             aa = np.linalg.norm(sxyz-mxyz)