Spectator fix