Fix the spectator-hang bug.