Scoreboard bug fix