Fixed battle bug