Fix breakage in Battle class (cred to Brian + Matt)