diff --git a/cue_builder.module b/cue_builder.module
index 14aac81..d3f2068 100644
--- a/cue_builder.module
+++ b/cue_builder.module
@@ -262,11 +262,11 @@ function cue_builder_form($form, &$form_state, $cue) {
   
   // add the node reference from the url if we are on the cue/add form
   // set a title
-  if(empty($form[variable_get('cue_builder_ref_field', '')]['und'][0]['nid']['#default_value'])){
+  if(empty($form[variable_get('cue_builder_ref_field', '')][LANGUAGE_NONE][0]['nid']['#default_value'])){
   	$ref_title = cue_builder_get_title('url');
-  	$form[variable_get('cue_builder_ref_field', '')]['und'][0]['nid']['#default_value'] = cue_builder_get_nid($form[variable_get('cue_builder_ref_field', '')]);
+  	$form[variable_get('cue_builder_ref_field', '')][LANGUAGE_NONE][0]['nid']['#default_value'] = cue_builder_get_nid($form[variable_get('cue_builder_ref_field', '')]);
   }else{ 
-    $ref_title = cue_builder_get_title('ref', $form[variable_get('cue_builder_ref_field', '')]['und'][0]['nid']['#default_value']);
+    $ref_title = cue_builder_get_title('ref', $form[variable_get('cue_builder_ref_field', '')][LANGUAGE_NONE][0]['nid']['#default_value']);
   }
   $form_state['cue'] = $cue;
   
@@ -374,7 +374,7 @@ function cue_builder_delete_form_submit($form, &$form_state) {
 
   drupal_set_message(t('%title deleted.', array('%title' => entity_label('cue', $cue))));
 
-  $form_state['redirect'] = "node/".$cue->field_cue_show_reference['und'][0]['nid'];
+  $form_state['redirect'] = "node/".$cue->field_cue_show_reference[LANGUAGE_NONE][0]['nid'];
 }
 
 /**