diff --git a/webform_conditional.js b/webform_conditional.js
index 9ed3b4c..b968b49 100755
--- a/webform_conditional.js
+++ b/webform_conditional.js
@@ -8,7 +8,7 @@ Drupal.behaviors.webform_conditional = function() {
   // create quasi static var to save perfomance
   Drupal.webform_conditional.wrappers = new Object();
   Drupal.webform_conditional.components = new Object();
-
+  Drupal.settings.webform_conditional = Drupal.settings.webform_conditional.pop();
 	$.each(Drupal.settings.webform_conditional.fields, function(triggerField_key, triggerField_info) {
 		
 		var formItemWrapper = Drupal.webform_conditional.getWrapper(triggerField_info);
diff --git a/webform_conditional.module b/webform_conditional.module
index fbadb14..4e483af 100755
--- a/webform_conditional.module
+++ b/webform_conditional.module
@@ -68,10 +68,10 @@ function webform_condtional_component_edit_submit($form, &$form_state) {
 }
 /*
  * Implements hook_form_alter().
-* Edit Webform
-* Add Javascript to describe dependent fields
-* Add validation of hidden conditional fields
-*/
+ *   Edit Webform
+ * Add Javascript to describe dependent fields
+ * Add validation of hidden conditional fields
+ */
 function webform_conditional_form_alter(&$form, $form_state, $form_id) {
   //todo: change to look only at beginning of string
   static $called_forms = array();
@@ -119,7 +119,6 @@ function webform_conditional_form_alter(&$form, $form_state, $form_id) {
             'default_value' => $row['value'],
           );
           $cids[] = $row['cid'];
-          
         }
         if ($row['type'] != 'fieldset' && _webform_condtional_component_is_conditional($row, $nid)) {
           //!empty($extra['webform_conditional_cid']) || ($row['pid'] != 0 && $row['mandatory'] == 1))
@@ -247,7 +246,6 @@ function _webform_conditional_get_css_ids($cids, $form) {
       $css_id = str_replace("_", "-", $components[$parent_cid]['form_key']) . "--" . $css_id;
       $parent_cid = $components[$parent_cid]['pid'];
     }
-    
     $css_ids[$cid] = "webform-component-$css_id";
   }
   drupal_alter('webform_conditional_css_ids', $css_ids, $form);
@@ -261,8 +259,12 @@ function _webform_conditional_get_css_ids($cids, $form) {
  *  The form
  */
 function webform_conditional_add_js(&$form, $form_state) {
-  drupal_add_js(array('webform_conditional' => $form['#webform_conditional_js']), "setting");
+  static $settings_count = 0;
+  // add $settings_count to ensure that settings array doesn't get merged
+  // The javascript will take the last element of this array
+  drupal_add_js(array('webform_conditional' => array($settings_count => $form['#webform_conditional_js'])), "setting");
   drupal_add_js(drupal_get_path('module', 'webform_conditional') . '/webform_conditional.js');
+  $settings_count++;
   return $form;
 }
 /**
@@ -331,8 +333,7 @@ function _webform_condtional_clear_element_values(&$element, &$form_state) {
       $reference_set = TRUE;
       $reference_element =& $reference_element[$key];
     }
-    else
-    {
+    else {
       $reference_set = FALSE;
       break;
     }
@@ -341,8 +342,7 @@ function _webform_condtional_clear_element_values(&$element, &$form_state) {
     if (is_array($reference_element)) {
       $reference_element = array();
     }
-    else
-    {
+    else {
       $reference_element = '';
     }
   }