Fix Move bug