Fixed scoreboard saving