Fixes #627
Merge pull request #659 from herby/gh-627

Fixes #627