Fixed to also work during Battles.