Better fix for waitForMoveStop.