Fix submove generation