Audit validation fix, CORE-443, CORE-434