Fixing scoreboard bug