Fixes #201
Merge pull request #202 from aesedepece/fix-for-issue-201

Fixes #201