[General] Fixed #355
Merge pull request #373 from frmwrk123/ticket_355

[General] Fixed #355