Scoreboard bugfix