Fixes #12
Merge branch 'hotfix/1.12'