diff --git a/handlers/efq_views_handler_field_field.inc b/handlers/efq_views_handler_field_field.inc
index 0410677..09a5ee4 100644
--- a/handlers/efq_views_handler_field_field.inc
+++ b/handlers/efq_views_handler_field_field.inc
@@ -55,7 +55,7 @@ class efq_views_handler_field_field extends views_handler_field_field {
    * Prepare $values to a format that the parent::render method understands,
    * so that we don't have to reinvent it.
    */
-  function pre_render(&$values) {
+  function post_execute(&$values) {
     $this->field_alias = $this->field;
 
     foreach ($values as $id => $entity) {
@@ -68,5 +68,10 @@ class efq_views_handler_field_field extends views_handler_field_field {
         'entity' => $entity,
       );
     }
+
+    // Now, transfer the data back into the resultset so it can be easily used.
+    foreach ($values as $row_id => &$value) {
+      $value->{'field_' . $this->options['id']} = $this->set_items($value, $row_id);
+    }
   }
-}
\ No newline at end of file
+}