Fixed no-velocity-limit bug