--- multistep.module.OLD	2009-10-15 09:18:59.000000000 +1100
+++ multistep.module	2009-10-15 09:13:00.000000000 +1100
@@ -570,6 +570,18 @@ function _multistep_get_steps($form_type
 }
 
 /**
+ * Determine the current step that the field should be part of in the current
+ * node type. This is used for multi-value fields.
+ */
+function _multistep_get_field_step($field, $type) {
+  $step = 1;
+  $group = _fieldgroup_field_get_group($type, $field);
+  $groups = fieldgroup_groups($type);
+  $step = $groups[$group]['settings']['multistep']['step'];
+  return $step;
+}
+
+/**
  * Determine the current step from the arguments, if no argument is supplied
  * or if this is the node creation form (as opposed to node editing form)
  * then set the current step as 1.
@@ -578,6 +590,14 @@ function _multistep_get_steps($form_type
  */
 function _multistep_get_current_step($type) {
   $step = 1;
+  // This condition occurs if using AHAH to add another value for a multi-value field.
+  if (arg(1) == 'js_add_more') {
+    $type = arg(2);
+    $field = arg(3);
+    // Decide step based on type/field combination
+    $step = _multistep_get_field_step($field, $type);
+    return $step;
+  }
   // Decide which step should be rendered.
   if (is_numeric(arg(3)) && arg(3) == 0 && user_access('toggle multistep')) {
     $step = 0;