fix according to audit