Index: multistep.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/multistep/multistep.module,v
retrieving revision 1.1.2.2.2.37
diff -u -p -r1.1.2.2.2.37 multistep.module
--- multistep.module	28 May 2010 02:10:27 -0000	1.1.2.2.2.37
+++ multistep.module	28 May 2010 04:18:11 -0000
@@ -707,12 +707,19 @@ function _multistep_get_field_step($fiel
  */
 function _multistep_get_current_step($type) {
   $step = 1;
-  // This condition occurs if using AHAH to add another value for a multi-value field.
   // @see http://drupal.org/node/566682 - Added support for hierarchical_select.
+  if (arg(0) == 'hierarchical_select_json') {
+    $hsid = $_POST['hsid'];
+    foreach ($_POST['taxonomy'] as $vid => $config) {
+      if ($config['hsid'] == $hsid) {
+        $step = variable_get('multistep_extra_taxonomy_' . $vid . '_' . $type, $step);
+      }
+    }
+  }
+  // This condition occurs if using AHAH to add another value for a multi-value field.
   if (arg(1) == 'js_add_more' // Add more button
   || arg(1) == 'js' // Upload through the upload module
-  || arg(1) == 'ahah' // Upload through the filefield module
-  || arg(0) == 'hierarchical_select_json') {
+  || arg(1) == 'ahah') { // Upload through the filefield module
     $type = str_replace('-', '_', arg(2));
     $field = arg(3);
     // Decide step based on type/field combination