FIX issue #641 (and thanks to commit #be706a6 from avocode/form-extensions)
FIX wrong test
Merge pull request #714 from sescandell/master

FIX issue #641