First attempt to fix #223
Merge pull request #224 from aesedepece/fix-for-issue-223

Fix for issue 223