Hotfix for battle. (still underconstruction)