fix a bug
Merge branch 'hotfix'