fix bug1
Merge branch 'hotfix/new-bug1'