diff --git includes/content.node_form.inc includes/content.node_form.inc
index 6515fde..142842b 100644
--- includes/content.node_form.inc
+++ includes/content.node_form.inc
@@ -198,6 +198,7 @@ function content_multiple_value_form(&$form, &$form_state, $field, $items) {
 
     $form_element[$field_name .'_add_more'] = array(
       '#type' => 'submit',
+      '#name' => $field_name .'_add_more',
       '#value' => t('Add another item'),
       '#weight' => $field['widget']['weight'] + $max + 1,
       // Submit callback for disabled JavaScript. drupal_get_form() might get
@@ -212,8 +213,8 @@ function content_multiple_value_form(&$form, &$form_state, $field, $items) {
       ),
       // When JS is disabled, the content_add_more_submit handler will find
       // the relevant field using these entries.
-      //'#field_name' => $field_name,
-      //'#type_name' => $content_type['type'],
+      '#field_name' => $field_name,
+      '#type_name' => $content_type['type'],
     );
 
     // Add wrappers for the fields and 'more' button.
@@ -236,11 +237,9 @@ function content_add_more_submit($form, &$form_state) {
   $field_name = $form_state['clicked_button']['#field_name'];
   $type_name = $form_state['clicked_button']['#type_name'];
 
-  foreach ($form['#field_info'] as $field_name => $field) {
-    // Make the changes we want to the form state.
-    if ($form_state['values'][$field_name][$field_name .'_add_more']) {
-      $form_state['item_count'][$field_name] = count($form_state['values'][$field_name]);
-    }
+  // Make the changes we want to the form state.
+  if ($form_state['values'][$field_name][$field_name .'_add_more']) {
+    $form_state['item_count'][$field_name] = count($form_state['values'][$field_name]);
   }
 }