Fixed Firsttime bug
Merge branch 'hotfix/firsttime'