*************** function conditional_fields_node_editing
*** 882,894 ****
        }
      }
  
-     $required_fields = $form['#conditional_fields']['required_fields'];
- 
-     if ($required_fields[$controlled_field_name]['in_group']) {
-       $controlled_field = &$form[$required_fields[$controlled_field_name]['in_group']][$controlled_field_name];
      }
      else {
-       $controlled_field = &$form[$controlled_field_name];      
      }
  
      // Controlled field
--- 940,950 ----
        }
      }
  
+     if (isset($required_fields[$controlled_field_name]['in_group'])) {
+       $controlled_field = &$fieldsets[$required_fields[$controlled_field_name]['in_group']][$controlled_field_name];
      }
      else {
+       $controlled_field = &$form[$controlled_field_name];
      }
  
      // Controlled field