Fixed scoreboard issue