Fixes #737
Merge pull request #738 from herby/gh-737

Fixes #737