Patch to non-clearing form, issue #19