fix move-stop issue