Fix scoreboard. Close #126