I believe this fixes the issues when using non-symmetric trajectories with non unit times.