Battle fixed so it can end