[EditSuite] Fixed #346