diff --git a/views/filefield_handler_field_data.inc b/views/filefield_handler_field_data.inc
index 608914c..428804d 100644
--- a/views/filefield_handler_field_data.inc
+++ b/views/filefield_handler_field_data.inc
@@ -48,8 +48,7 @@ class filefield_handler_field_data extends views_handler_field_node {
     // Copied from views_handler_field_node(). We just remove the call to
     // sanitize_value() from the original call, becaue our value has already
     // been cleaned by filefield_data_value().
-    $value = $this->get_value($values);
-    return $this->render_link($value, $values);
+    return $this->render_link($values->{$this->field_alias}, $values);
   }
 
 }
diff --git a/views/filefield_handler_field_icon.inc b/views/filefield_handler_field_icon.inc
index cecea83..29a45c1 100644
--- a/views/filefield_handler_field_icon.inc
+++ b/views/filefield_handler_field_icon.inc
@@ -15,10 +15,10 @@ class filefield_handler_field_icon extends views_handler_field {
   function render($values) {
     $value = $this->get_value($values);
     $pseudo_file = array(
-      'fid' => $this->get_value($values, 'fid'),
-      'filemime' => $value,
-      'filename' => $this->get_value($values, 'filename'),
-      'filesize' => $this->get_value($values, 'filesize'),
+      'fid' => $values->{$this->aliases['fid']},
+      'filemime' => $values->{$this->field_alias},
+      'filename' => $values->{$this->aliases['filename']},
+      'filesize' => $values->{$this->aliases['filesize']},
     );
     return theme('filefield_icon', $pseudo_file);
   }