I thought your checks: https://github.com/webinos/webinos-pzp/pull/20/files#L2R230 could resolve this issue.