diff --git a/sites/all/modules/node_clone/clone.info b/sites/all/modules/node_clone/clone.info
index 0d379de..b3d5cc2 100644
--- a/sites/all/modules/node_clone/clone.info
+++ b/sites/all/modules/node_clone/clone.info
@@ -8,8 +8,8 @@ files[] = views/clone.views.inc
 files[] = views/views_handler_field_node_link_clone.inc
 
 ; Information added by drupal.org packaging script on 2011-02-25
-;version = "7.x-1.x-dev"
-;core = "7.x"
-;project = "node_clone"
-;datestamp = "1298619758"
+version = "7.x-1.x-dev"
+core = "7.x"
+project = "node_clone"
+datestamp = "1298619758"
 
diff --git a/sites/all/modules/node_clone/clone.module b/sites/all/modules/node_clone/clone.module
index bbd99d7..8bc0ff0 100644
--- a/sites/all/modules/node_clone/clone.module
+++ b/sites/all/modules/node_clone/clone.module
@@ -55,7 +55,7 @@ function clone_menu() {
 function clone_access_cloning($node) {
   global $user;
   // Check basic permissions first.
-  $access = clone_is_permitted($node->type) && (user_access('clone node') || ($user->uid && ($node->uid == $user->uid) && user_access('clone own nodes')));  
+  $access = clone_is_permitted($node->type) && (user_access('clone node') || ($user->uid && ($node->uid == $user->uid) && user_access('clone own nodes')));
   // Make sure the user can view the original node content, and create a new one..
   $access = $access && node_access('view', $node) && node_access('create', $node->type);
   // Let other modules alter this - for exmple to only allow some users
diff --git a/sites/all/modules/node_clone/views/views_handler_field_node_link_clone.inc b/sites/all/modules/node_clone/views/views_handler_field_node_link_clone.inc
index fadac29..c79a229 100644
--- a/sites/all/modules/node_clone/views/views_handler_field_node_link_clone.inc
+++ b/sites/all/modules/node_clone/views/views_handler_field_node_link_clone.inc
@@ -14,24 +14,16 @@ class views_handler_field_node_link_clone extends views_handler_field_node_link
 
   function render($values) {
     // Insure that user has access to clone this node.
-    if ($entity = $this->get_value($values)) {
-      $node = new stdClass();
-    
-    
-      $node->nid = $entity->nid;
-      $node->uid = $entity->uid;
-      $node->type = $entity->type;
-      $node->status = 1; // unpublished nodes ignore access control
-      if (!clone_access_cloning($node)) {
-        dpm(clone_access_cloning($node));
-        return;
-      }
-  
-      $text = !empty($this->options['text']) ? $this->options['text'] : t('clone');
-      return l($text, "node/$node->nid/clone", array('query' => drupal_get_destination()));
+    $node = new stdClass();
+    $node->nid = $values->{$this->aliases['nid']};
+    $node->uid = $values->{$this->aliases['uid']};
+    $node->type = $values->{$this->aliases['type']};
+    $node->status = 1; // unpublished nodes ignore access control
+    if (!clone_access_cloning($node)) {
+      return;
     }
-    
-    
-    
+
+    $text = !empty($this->options['text']) ? $this->options['text'] : t('clone');
+    return l($text, "node/$node->nid/clone", array('query' => drupal_get_destination()));
   }
 }