improve work with after save event #4086