diff --git a/treeable/treeable.module b/treeable/treeable.module
index eb31c9a..bc5d79c 100644
--- a/treeable/treeable.module
+++ b/treeable/treeable.module
@@ -252,8 +252,8 @@ function _treeable_field_form($entity_type, $entity, $field, $instance, $langcod
       switch ($field['cardinality']) {
         case FIELD_CARDINALITY_UNLIMITED:
           $filled_items = _field_filter_items($field, $items);
-          $current_item_count = isset($form_state['field_item_count'][$field_name])
-                                ? $form_state['field_item_count'][$field_name]
+          $current_item_count = isset($form_state['values'][$field_name][$langcode])
+                                ? sizeof($form_state['values'][$field_name][$langcode])
                                 : count($items);
           // We always want at least one empty icon for the user to fill in.
           $max = ($current_item_count > count($filled_items))