Reenable ObjectModifiedEvent but conditional