Fix bug with battling