Fixed bugs
Merge branch 'hotfix/1.2.1'