[EditSuite] Fixed #38