Fixes #188
Merge pull request #189 from Erikvl87/fix-188

Fixes #188