FIX: additional fix for #820.
TESTS: FORM tests modified accordingly.