Hopefully fixes #109
Merge pull request #127 from MaPePeR/fix-109

Hopefully fixes #109