Velocity conservation bug fixed