Fixes #209.
Merge pull request #210 from frmwrk123/fix/209

Fixes #209.