fix
Merge branch 'hotfix/userbarbug'