Temporary fix for scoreboard
Merge branch 'hotfix/v0.3.6'