Fix yet another move numbering edge case.