[General] Fixed #362
Merge pull request #364 from frmwrk123/ticket_362

[General] Fixed #362