[EditSuite] Fixed #346
Merge pull request #347 from frmwrk123/ticket_346

[EditSuite] Fixed #346