Fixes #77
Merge pull request #78 from heiglandreas/hotfix/#77

Fixes #77