Scoreboard bug fixed