MODE-2251 Audit fix