Fix issue #43
Merge branch 'hotfix-43'