Battles now end correctly