Fix rejoining battles