Audit fix (7/33)

Audit fix