Fixed spectator join logic