Fix to scoreboard sort