bug fixed
Merge branch 'hotfix/bug1'