diff --git a/eva.module b/eva.module
index 92b9cf3..b58f520 100755
--- a/eva.module
+++ b/eva.module
@@ -76,7 +76,7 @@ function eva_entity_view_alter(&$build, $type) {
   foreach ($views as $info) {
     $longname = $info['name'] . '_' . $info['display'];
     if (isset($fields[$longname]) && $fields[$longname]['visible']) {
-      _eva_build_extra_fields($build, $entity, $info['name'], $info['display']);
+      _eva_build_extra_fields($build, $entity, $fields, $info['name'], $info['display']);
     }
   }
 }
@@ -101,7 +101,7 @@ function eva_field_attach_form($entity_type, $entity, &$form, &$form_state, $lan
   // added to the form.
   foreach ($views as $info) {
     if (isset($fields[$info['name'] . '_' . $info['display']])) {
-      _eva_build_extra_fields($form, $entity, $info['name'], $info['display']);
+      _eva_build_extra_fields($build, $entity, $fields, $info['name'], $info['display']);
     }
   }
 }
@@ -113,12 +113,14 @@ function eva_field_attach_form($entity_type, $entity, &$form, &$form_state, $lan
  *   The rendered entity or the entity form.
  * @param object $entity
  *   The entity object. This is used by the display plugin for processing.
+ * @param array $fields
+ *   The array of extra fields.
  * @param string $name
  *   The name of the view.
  * @param string $display_id
  *   The display ID of the view.
  */
-function _eva_build_extra_fields(&$build, $entity, $name, $display_id) {
+function _eva_build_extra_fields(&$build, $entity, $fields, $name, $display_id) {
   if ($view = views_get_view($name)) {
     $view->set_display($display_id);
     if ($view->access($display_id)) {