Fixed #287
Merge pull request #289 from frmwrk123/fix/287

Fixed #287