fix move bugs