diff --git a/conditional_fields.js b/conditional_fields.js
index 9baafc5..51304ab 100644
--- a/conditional_fields.js
+++ b/conditional_fields.js
@@ -55,7 +55,11 @@ Drupal.ConditionalFields.doAnimation = function(fieldSettings, showOrHide, onPag
   /* Multiple fields are enclosed in a wrapper */
   if ($(fieldSettings.field_id).parents('#' + fieldSettings.field_id.substring(13) + '-add-more-wrapper').length == 1) {
     var toSwitch = $('#' + fieldSettings.field_id.substring(13) + '-add-more-wrapper');
-  } else {
+  } else if (fieldSettings.field_id.substr(0,18) == '#conditional-group') {
+    var changed = fieldSettings.field_id.substr(19);
+    var changed = '.vertical-tabs-list-group_' + changed.replace(/-/gi, '_');
+    var toSwitch = $(changed.toString()).parent();
+  } else{
     var toSwitch = $(fieldSettings.field_id);
   }
 
diff --git a/conditional_fields.module b/conditional_fields.module
index 4d0b87c..099f1ae 100755
--- a/conditional_fields.module
+++ b/conditional_fields.module
@@ -1113,7 +1113,7 @@ function conditional_fields_add_js($settings) {
   static $js;
   if (!$js) {
     drupal_add_js(array('ConditionalFields' => $settings), 'setting');
-    drupal_add_js(drupal_get_path('module', 'conditional_fields') . '/conditional_fields.js');
+    drupal_add_js(drupal_get_path('module', 'conditional_fields') . '/conditional_fields.js', 'footer');
     $js = TRUE;
   }
 }