Fix issue #233
Merge pull request #237 from wejn/fix-issue-233

Fix issue #233