[General] Fixed #354
Merge pull request #374 from frmwrk123/ticket_354

[General] Fixed #354