Fix scoreboard not counting teams correctly when switching