diff --git a/relation_dummy_field/relation_dummy_field.module b/relation_dummy_field/relation_dummy_field.module
index 3550144..7342206 100644
--- a/relation_dummy_field/relation_dummy_field.module
+++ b/relation_dummy_field/relation_dummy_field.module
@@ -64,9 +64,9 @@ function relation_dummy_field_field_formatter_info() {
 function relation_dummy_field_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
   list($entity_id) = entity_extract_ids($entity_type, $entity);
-  foreach ($items as $delta => $item) {
+  foreach ($items as $delta => $relation) {
     $links = array();
-    foreach ($item->endpoints[LANGUAGE_NONE] as $endpoint) {
+    foreach ($relation['endpoints'][LANGUAGE_NONE] as $endpoint) {
       $related_entities = entity_load($endpoint['entity_type'], array($endpoint['entity_id']));
       $related_entity = reset($related_entities);
       if ($endpoint['entity_type'] == $entity_type && $endpoint['entity_id'] == $entity_id) {
@@ -79,8 +79,8 @@ function relation_dummy_field_field_formatter_view($entity_type, $entity, $field
       $link['title'] = entity_label($endpoint['entity_type'], $related_entity);
       $links[] = $link;
     }
-    $uri = entity_uri('relation', $item);
-    $relation_link = l(t('Relation @rid', array('@rid' => $item->rid)), $uri['path'], $uri['options']);
+    $uri = entity_uri('relation', (object) $relation);
+    $relation_link = l(t('Relation @rid', array('@rid' => $relation['rid'])), $uri['path'], $uri['options']);
     // Can't use #heading as it's mercilessly check_plain'd.
     $element[$delta]['relation']['heading']['#markup'] = t('<h4>Part of !link</h4>', array('!link' => $relation_link));
     $element[$delta]['relation']['links'] = array(
@@ -98,7 +98,10 @@ function relation_dummy_field_field_formatter_view($entity_type, $entity, $field
 function relation_dummy_field_field_formatter_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) {
   foreach ($entities as $id => $entity) {
     $relation_ids = array_keys(relation_query($entity_type, $id)->execute());
-    // Who knows why but field does not like if the delta does not start at 0...
-    $items[$id] = $relation_ids ? array_values(entity_load('relation', $relation_ids)) : array();
+    $relations = entity_load('relation', $relation_ids);
+    $items[$id] = array();
+    foreach ($relations as $relation) {
+      $items[$id][] = (array) $relation;
+    }
   }
 }