Fixes #197
Merge pull request #217 from aesedepece/fix-for-issue-197

Fixes #197