fixbug3
Merge branch 'hotfix/bug3'