More sane field verification logic