#1492 audit logic fix