Fixed some moving issue