Bug fix
Merge branch 'hotfix/1.7.1'