diff --git a/src/symba/symba_frag_pos.f90 b/src/symba/symba_frag_pos.f90
index 9262c8186..762ccf0d1 100644
--- a/src/symba/symba_frag_pos.f90
+++ b/src/symba/symba_frag_pos.f90
@@ -225,9 +225,9 @@ subroutine set_scale_factors()
       vcom(:) = (mass(1) * v(:,1) + mass(2) * v(:,2)) / mtot
 
       ! Set scale factors
-      mscale = mtot
+      mscale = mtot !! Because of the implied G, mass is actually G*mass with units of distance**3 / time**2
       rscale = norm2(x(:,2) - x(:,1))
-      vscale = norm2(v(:,2) - v(:,1))
+      vscale = sqrt(mscale / rscale)
       tscale = rscale / vscale
       Lscale = mscale * rscale * vscale
       Escale = mscale * vscale**2