--- field_collection.module.orig	2011-08-18 16:13:51.000000000 +0400
+++ field_collection.module	2011-09-09 20:52:15.204036001 +0400
@@ -771,6 +771,9 @@ function field_collection_field_formatte
 function field_collection_field_formatter_links(&$element, $entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $settings = $display['settings'];
 
+  $delta = count(element_children($element));
+  $element['#items'] = $items; 
+
   if ($settings['add'] && ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED || count($items) < $field['cardinality'])) {
     // Check whether the current is allowed to create a new item.
     $field_collection_item = entity_create('field_collection_item', array('field_name' => $field['field_name']));
@@ -778,16 +781,17 @@ function field_collection_field_formatte
     if (field_collection_item_access('create', $field_collection_item)) {
       $path = field_collection_field_get_path($field);
       list($id) = entity_extract_ids($entity_type, $entity);
-      $element['#suffix'] = '';
+      $element[$delta]['#suffix'] = '';
       if (!empty($settings['description'])) {
-        $element['#suffix'] .= '<div class="description field-collection-description">' . field_filter_xss($instance['description']) . '</div>';
+        $element[$delta]['#suffix'] .= '<div class="description field-collection-description">' . field_filter_xss($instance['description']) . '</div>';
       }
       $add_path = $path . '/add/' . $entity_type . '/' . $id;
-      $element['#suffix'] .= '<ul class="action-links action-links-field-collection-add"><li>' . l($settings['add'], $add_path, array('query' => drupal_get_destination())) . "</li></ul>";
+      $element[$delta]['#suffix'] .= '<ul class="action-links action-links-field-collection-add"><li>' . l($settings['add'], $add_path, array('query' => drupal_get_destination())) . "</li></ul>";
+      $element['#items'][$delta] = array();
     }
   }
   // If there is no add link, add a special class to the last item.
-  if (empty($element['#suffix'])) {
+  if (empty($element[$delta]['#suffix']) && count($items)) {
     $index = count(element_children($element)) - 1;
     $element[$index]['#attributes']['class'][] = 'field-collection-view-final';
   }