diff --git a/date.module b/date.module
index d2bd8f2..6bdc640 100644
--- a/date.module
+++ b/date.module
@@ -478,15 +478,7 @@ function date_prepare_entity($formatter, $entity_type, $entity, $field, $instanc
     $date_handler = new date_sql_handler($field);
     $arg0 = !empty($options['multiple_from']) ? $date_handler->arg_replace($options['multiple_from']) : variable_get('date_min_year', 100) . '-01-01T00:00:00';
     $arg1 = !empty($options['multiple_to']) ? $date_handler->arg_replace($options['multiple_to']) : variable_get('date_max_year', 4000) . '-12-31T23:59:59';
-    if (!empty($arg0) && !empty($arg1)) {
-      $arg = $arg0 . '--' . $arg1;
-    }
-    elseif (!empty($arg0)) {
-      $arg = $arg0;
-    }
-    elseif (!empty($arg1)) {
-      $arg = $arg1;
-    }
+    $arg = $arg0 . '--' . $arg1;
     if (!empty($arg)) {
       $range = $date_handler->arg_range($arg);
       $start = date_format($range[0], $format);
@@ -499,6 +491,7 @@ function date_prepare_entity($formatter, $entity_type, $entity, $field, $instanc
         }
         elseif ((!empty($max_count) && is_numeric($max_count) && $count >= $max_count) ||
           (!empty($value['value'])  && $value['value'] < $start) ||
+          (!empty($value['value'])  && $value['value'] > $end) ||
           (!empty($value['value2']) && $value['value2'] > $end)) {
             unset($entity->{$field_name}[$langcode][$delta]);
         }