second hotfix
Merge branch 'hotfix/v0.1.1.hotfix'