Verifier hotfix