FIX issue #641 (and thanks to commit #be706a6 from avocode/form-extensions)