fix bug
Merge branch 'hotfix/bug2'