bugfix
Merge branch 'hotfix/v1.8.1'