Fix crash when rejoining