Scoreboard Fix