Fix issue with battle selection