Fix run-away-at-same-speed bug