AdaptiveControl: added temp fix for velocities