Fix scoreboard logic