Fix a bug
Merge branch 'hotfix/1.2.1'