--- C:/Documents and Settings/drupal7/sites/all/modules/commerce_shipping/plugins/format/copy_billing_address.old	Fri Mar 30 15:49:33 2012
+++ C:/Documents and Settings/drupal7/sites/all/modules/commerce_shipping/plugins/format/copy_billing_address.inc	Fri Mar 30 15:54:38 2012
@@ -32,7 +32,8 @@
       );
     }
     else {
-      $format['#prefix'] = '<div id="copy-billing-address">';
+      $format['#prefix'] .= '<div id="copy-billing-address">';
+	  $format['#suffix'] .= '</div>';
       commerce_shipping_copy_billing_address_mark_required($format, TRUE, TRUE);
       if (!empty($format['#validate'])) {
         $format['#element_validate'] = array('commerce_shipping_copy_billing_address_validate') + $format['#element_validate'];
@@ -61,10 +62,7 @@
       }
     }
     if (!empty($form['#prefix']) && strpos($form['#prefix'], 'copy-billing-address') !== FALSE && !$required) {
-      $form['#prefix'] = '<div id="copy-billing-address" class="hidden">';
-    }
-    elseif (!empty($form['#prefix']) && strpos($form['#prefix'], 'copy-billing-address') !== FALSE && $required) {
-      $form['#prefix'] = '<div id="copy-billing-address">';
+      $form['#prefix'] = str_replace('<div id="copy-billing-address">', '<div id="copy-billing-address" class="hidden">', $form['#prefix']);
     }
     foreach ($form as &$child) {
       // Recursion.