Fixing verifier issue