[General] Fixed #357
Merge pull request #371 from frmwrk123/ticket_357

[General] Fixed #357