Fix MoveWay mode (fixes #602)