Fixed the velocities... again. This determination method appears robust.