Fixed #261
Merge pull request #262 from frmwrk123/fix/261

Fixed #261