Bug Fix for #426.

This is really a temporary hack, but it seems to work.  The problem is
that the verifier design is really broken, and needs to be reworked.