Index: openacs-4/packages/xotcl-core/tcl/generic-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/generic-procs.tcl,v
diff -u -N -r1.96 -r1.97
--- openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	27 Apr 2015 15:28:21 -0000	1.96
+++ openacs-4/packages/xotcl-core/tcl/generic-procs.tcl	15 Jun 2015 19:25:56 -0000	1.97
@@ -140,7 +140,9 @@
   Form instproc set_form_data {} {
     my instvar data data_id
     foreach var [$data info vars] {
-      my var $var [list [$data set $var]]
+      if {![$data array exists $var]} {
+        my var $var [list [$data set $var]]
+      }
     }
     # Alias object_id to the id of our object
     if {[$data exists $data_id]} {