Fix #223
Merge pull request #224 from jrrideout/issue-223

Fix #223