Fix move count on puzzles 18+