diff --git a/commerce_fieldgroup_panes.module b/commerce_fieldgroup_panes.module
index b41b623..c81d477 100644
--- a/commerce_fieldgroup_panes.module
+++ b/commerce_fieldgroup_panes.module
@@ -8,11 +8,9 @@
  */
 
 /**
- * Implements hook_commerce_checkout_pane_info().
+ * Implements hook_commerce_checkout_pane_info_alter().
  */
-function commerce_fieldgroup_panes_commerce_checkout_pane_info() {
-  
-  $checkout_panes = array();
+function commerce_fieldgroup_panes_commerce_checkout_pane_info_alter(&$checkout_panes) {
   
   $groups = field_group_info_groups('commerce_order', 'commerce_order', 'form', TRUE);
   
@@ -26,15 +24,19 @@ function commerce_fieldgroup_panes_commerce_checkout_pane_info() {
   // Iterate over the field groups and convert them into 
   // checkout panels. By default the panels are not enabled. 
   foreach ($groups as $type => $group) {
-    $checkout_panes['commerce_fieldgroup_pane__' . $type . '__' . $group->id] = array(
+    $defaults = array(
       'name' => t('Order Fieldgroup') . ': ' . $group->label,
       'title' => $group->label,
       'base' => 'commerce_fieldgroup_panes_contents',
       'enabled' => FALSE,
-    );    
+    );
+    if (isset($checkout_panes['commerce_fieldgroup_pane__' . $group->identifier])) {
+      $checkout_panes['commerce_fieldgroup_pane__' . $group->identifier] += $defaults;
+    }
+    else {
+      $checkout_panes['commerce_fieldgroup_pane__' . $group->identifier] = $defaults;
+    }
   }
-  
-  return $checkout_panes;
 }
 
 /**
@@ -51,7 +53,8 @@ function commerce_fieldgroup_panes_contents_settings_form($checkout_pane) {
 function commerce_fieldgroup_panes_contents_checkout_form($form, &$form_state, $checkout_pane, $order) {
   $pane_form = array();
   $pane_info = explode('__', $checkout_pane['pane_id']);
-  $type = $pane_info[1];
+  $identifier = $pane_info[1];
+  list($type, $entity_type, $entity_bundle) = explode('|', $identifier);
   
   $form_state['commerce_order'] = $order;