Bugfix: Scoreboard now properly returned to default