[hotfix/1.0.1] fixes