diff --git a/transforms/adl2controllerclasses.xslt b/transforms/adl2controllerclasses.xslt
index 5b2dbce..568ac2b 100755
--- a/transforms/adl2controllerclasses.xslt
+++ b/transforms/adl2controllerclasses.xslt
@@ -9,8 +9,8 @@
     Transform ADL into (partial) controller classes
     
     $Author: sb $
-    $Revision: 1.21 $
-    $Date: 2008-10-09 16:12:21 $
+    $Revision: 1.22 $
+    $Date: 2008-10-31 13:10:22 $
   -->
 
 <!-- WARNING WARNING WARNING: Do NOT reformat this file! 
@@ -67,7 +67,7 @@
 		//
 		//  Automatically generated abstract super class for controllers for the
 		//	<xsl:value-of select="/adl:application/@name"/> application; generated using
-		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.21 $', 10)"/>
+		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.22 $', 10)"/>
 		//
 		//  <xsl:value-of select="/adl:application/@revision"/>
 		//
@@ -135,7 +135,7 @@
 		//
 		//  Controller for auto-generated forms for editing <xsl:value-of select="@name"/>s
 		//  Automatically generated from application description using
-		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.21 $', 10)"/>
+		//  adl2controllerclasses.xslt version <xsl:value-of select="substring( '$Revision: 1.22 $', 10)"/>
 		//
 		//  This file is automatically generated; DO NOT EDIT IT.
 		//
@@ -426,8 +426,6 @@
 
 				string[] <xsl:value-of select="concat(@name, 'Values')"/> = Form.GetValues( "<xsl:value-of select="concat( 'instance.', @name)"/>");
 
-				if ( <xsl:value-of select="concat(@name, 'Values')"/> != null)
-				{
 				/* update the linking table for my <xsl:value-of select="@name"/>; first smash the old values */
 				if ( <xsl:value-of select="concat( 'record.', @name)"/> != null)
 				{
@@ -438,6 +436,8 @@
 				<xsl:value-of select="concat( 'record.', @name)"/> = new HashedSet&lt;<xsl:value-of select="concat( $entityns, '.', @entity)"/>&gt;();
 				}
 
+				if ( <xsl:value-of select="concat(@name, 'Values')"/> != null)
+				{
 				/* then reinstate the values from the indexes passed */
 				foreach ( string index in <xsl:value-of select="concat(@name, 'Values')"/>)
 				{