Fixes #219.
Merge pull request #222 from frmwrk123/fix/219

Fixes #219.