Fixed proper saving of enriched EDM