diff --git a/data_entity/views/data_entity_views_handler_field_edit_link.inc b/data_entity/views/data_entity_views_handler_field_edit_link.inc
index a3adb57..57ca5a2 100644
--- a/data_entity/views/data_entity_views_handler_field_edit_link.inc
+++ b/data_entity/views/data_entity_views_handler_field_edit_link.inc
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file
- * Class defition for data_entity_views_handler_field_edit_link.
+ * Class definition for data_entity_views_handler_field_edit_link.
  */
 
 /**
@@ -22,10 +22,21 @@ class data_entity_views_handler_field_edit_link extends views_handler_field {
 
   function render($values) {
     $table = $this->view->base_table;
-    $base_field = $this->view->base_field;
+    
+    $base_field = $table . '_' . $this->view->base_field;
+    // drupal_set_message($base_field);
+    $col = @$values->$base_field;
+    
+    if ($col == '') {
+      $base_field = $this->view->base_field;
+      // drupal_set_message($base_field);
+      $col = @$values->$base_field;
+    }
+    
+    // drupal_set_message(serialize($values));
 
     $this->options['alter']['make_link'] = TRUE;
-    $this->options['alter']['path'] = 'admin/content/data/entity/' . $table . '/' . $values->$base_field;
+    $this->options['alter']['path'] = 'admin/content/data/entity/' . $table . '/' . $col;
     $this->options['alter']['query'] = drupal_get_destination();
 
     return t('edit item');