Fix MoveTo bug for some cases