fix hotfix
Merge branch 'hotfix-1.0.0'