[General] Fixed #361
Merge pull request #365 from frmwrk123/ticket_361

[General] Fixed #361
[General] Resolved #360