Hotfix for #395
Merge pull request #397 from leider/master

Hotfix for #395