fix bug2
Merge branch 'hotfix/new-bug2'