diff --git a/includes/media.fields.inc b/includes/media.fields.inc
index 8beac79..6d7b051 100644
--- a/includes/media.fields.inc
+++ b/includes/media.fields.inc
@@ -140,7 +140,12 @@ function media_field_prepare_view($entity_type, $entities, $field, $instances, $
   foreach ($entities as $id => $entity) {
     foreach ($items[$id] as $delta => $item) {
       if (is_array($item) && !empty($item['fid'])) {
-        $items[$id][$delta]['file'] = $files[$item['fid']];
+        if (isset($items[$id][$delta]['data'])) {
+          $items[$id][$delta]['data'] = unserialize($items[$id][$delta]['data']);
+        }
+
+        $items[$id][$delta]['file'] = clone($files[$item['fid']]);
+        $items[$id][$delta]['file']->field = $items[$id][$delta]['data'];
       }
     }
   }