fix Velocity logic