Use a persistent scoreboard, fixes all scoreboard issues