Re-fix move machine, Jirachi/Kyu fix
Actually fix Move Machine
Merge pull request #944 from Fuzzysqurl/fix

Re-fix Move Machine