--- modules/content_multigroup/content_multigroup.module.orig	2008-10-22 13:02:41.000000000 +0200
+++ modules/content_multigroup/content_multigroup.module	2008-11-22 19:26:05.000000000 +0100
@@ -359,32 +359,33 @@ function content_multigroup_display_over
     //'table' => t('Table'), // TODO add this later
     'hidden' => t('<Hidden>'),
   );
-  foreach ($groups as $name => $group) {
+  foreach ($groups as $group_name => $group) {
     if ($group['group_type'] != 'multigroup') {
       continue;
     }
     $defaults = $group['settings']['multigroup']['display_settings'];
 
-    $form_name = $name .'_subgroup';
-    $form['#fields'] = array_merge(array($form_name), $form['#fields']);
-    $form[$form_name] = array(
+    $subgroup_name = $group_name .'_subgroup';
+    $form['#fields'] = array_merge(array($subgroup_name), $form['#fields']);
+    $form[$subgroup_name] = array(
       'human_name' => array('#value' => t('[Subgroup format]')),
       'weight' => array('#type' => 'value', '#value' => -20),
-      'parent' => array('#type' => 'value', '#value' => $name),
+      'parent' => array('#type' => 'value', '#value' => $group_name),
     );
     if ($contexts_selector == 'basic') {
-      $form[$form_name]['label'] = array(
+      $form[$subgroup_name]['label'] = array(
         '#type' => 'select',
         '#options' => $label_options,
         '#default_value' => isset($defaults['label']) ? $defaults['label'] : 'above',
       );
     }
     foreach ($contexts as $key => $title) {
-      $form[$form_name][$key]['format'] = array(
+      $form[$subgroup_name][$key]['format'] = array(
         '#type' => 'select',
         '#options' => $options,
         '#default_value' => isset($defaults[$key]) ? $defaults[$key] : 'fieldset',
       );
+      $form[$subgroup_name][$key]['exclude'] = array();
     }
   }
   return $form;
@@ -661,7 +662,7 @@ function content_multigroup_group_form(&
 
     // There may be missing delta values for fields that were
     // never created, so check first.
-    if (!empty($node->$field_name) && count($node->$field_name) >= $delta + 1) {
+    if (!empty($node->$field_name) && isset($node->{$field_name}[$delta])) {
       $node_copy->$field_name = array($delta => $node->{$field_name}[$delta]);
     }
     else {