Fixed #197.
Merge pull request #198 from frmwrk123/fix/197

Fixed #197.