proper fix for the audit save changes problem