Hotfix. See issue 29.
Merge branch 'hotfix-29'