Fixes #180
Merge pull request #193 from aesedepece/fix-for-issue-180

Fixes #180