Fix issue #168
Merge branch 'hotfix/issue-#168'