Velocity failsafe added