Fixed scoreboard which closes #259