diff -u b/conditional_fields.module b/conditional_fields.module
--- b/conditional_fields.module
+++ b/conditional_fields.module
@@ -1027,7 +1027,7 @@
       continue;
     }
 
-    $values = conditional_fields_field_form_get_values($field_parents_key, $dependency['dependee'], $form, $form_state);
+    $values = conditional_fields_field_form_get_values($dependency['dependee'], $form, $form_state);
 
     $evaluated_dependees[$dependent['#field_name']][$dependency['options']['grouping']][] = conditional_fields_evaluate_dependency('edit', $values, $dependency['options']);
   }
@@ -1038,12 +1038,12 @@
 /**
  * Extracts field values from a submitted form.
  */
-function conditional_fields_field_form_get_values($field_parents_key, $field_name, $form, $form_state) {
+function conditional_fields_field_form_get_values($field_name, $form, $form_state) {
   if (empty($form['#conditional_fields'][$field_parents_key][$field_name])) {
     return array();
   }
 
-  $field_parents = $form['#conditional_fields'][$field_parents_key][$field_name]['parents'];
+  $field_parents = $form['#conditional_fields'][$field_name]['parents'];
 
   // We have the parents of the field, but depending on the entity type and
   // the widget type, they may include additional elements that are actually
@@ -1490,6 +1490,24 @@
   );
 }
 
+/**
+ * Implements hook_library().
+ */
+function conditional_fields_library() {
+  return array(
+    'conditional_fields' => array(
+      'tile' => 'Conditional Fields',
+      'version' => '1.0.0',
+      'js' => array(
+        drupal_get_path('module', 'conditional_fields') . '/js/conditional_fields.js' => array('group' => JS_DEFAULT),
+      ),
+      'dependencies' => array(
+        array('system', 'drupal.states'),
+      ),
+    ),
+  );
+}
+
 /**
  * Builds a list of supported states that may be applied to a dependent field.
  */