Fixed moves issue