PDPGroup Audit Fix