Fixes issue #87.

Adds deferred preparer implementation :-)