FIX: issue #604 (FORM underscore broken)