Index: hierarchical_select.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/hierarchical_select/hierarchical_select.module,v
retrieving revision 1.81
diff -u -F^f -r1.81 hierarchical_select.module
--- hierarchical_select.module	30 May 2008 20:44:36 -0000	1.81
+++ hierarchical_select.module	2 Jun 2008 17:02:57 -0000
@@ -1240,9 +1240,6 @@ function _hierarchical_select_hierarchy_
   // Build the lineage.
   //
 
-  // Validate and clean up the selection.
-  $selection = _hierarchical_select_hierarchy_validate($selection, $config['module'], $config['params']);
-
   // If save_linage is enabled, reconstruct the lineage. This is necessary
   // because e.g. the taxonomy module stores the terms by order of weight and
   // lexicography, rather than by hierarchy.
@@ -1271,6 +1268,9 @@ function _hierarchical_select_hierarchy_
     }
   }
 
+  // Validate the hierarchy.
+  $selection = _hierarchical_select_hierarchy_validate($selection, $config['module'], $config['params']);
+
   // When nothing is currently selected, set the root level to:
   // - "<none>" when:
   //    - enforce_deepest is enabled *and* level labels are enabled *and