[General] Fixed #356
Merge pull request #372 from frmwrk123/ticket_356

[General] Fixed #356