Dammit, just actually had a look for info on the bug and it *is* common. :(
Sounds like saving before the battle and reloading till you get it to work is the only solution.