Workaround for #74. What a hack.
Merge pull request #82 from jfly/issue74

Fix for #74