Fixed scoreboard issues
Merge branch 'hotfix/v0.3.4'