Small fix
Merge branch 'hotfix/v0.0.8.3a'