Fixed #286
Merge pull request #298 from frmwrk123/fix/286

Fixed #286