Fixes #407
Merge pull request #409 from pdehaan/issue-407

Fixes #407