Fixed control_velocity