diff --git a/date_views/includes/date_views_argument_handler_simple.inc b/date_views/includes/date_views_argument_handler_simple.inc
index faff05a..dedef6d 100644
--- a/date_views/includes/date_views_argument_handler_simple.inc
+++ b/date_views/includes/date_views_argument_handler_simple.inc
@@ -279,7 +279,7 @@ class date_views_argument_handler_simple extends views_handler_argument_date {
     // If requested, add the delta field to the view so we can later find the value that matched our query.
     if (!empty($this->options['add_delta']) && (substr($this->real_field, -6) == '_value' || substr($this->real_field, -7) == '_value2')) {
       $this->query->add_field($this->table_alias, 'delta');
-      $real_field_name = str_replace(array('_value', '_value2'), '', $this->real_field);
+      $real_field_name = str_replace(array('_value2', '_value'), '', $this->real_field);
       $this->query->add_field($this->table_alias, 'entity_id', 'date_id_' . $real_field_name);
       $this->query->add_field($this->table_alias, 'delta', 'date_delta_' . $real_field_name);
     }
diff --git a/date_views/includes/date_views_filter_handler_simple.inc b/date_views/includes/date_views_filter_handler_simple.inc
index 8a46253..12c6c9e 100644
--- a/date_views/includes/date_views_filter_handler_simple.inc
+++ b/date_views/includes/date_views_filter_handler_simple.inc
@@ -119,7 +119,7 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
     list($table_name, $field_name) = explode('.', $field);
     if (!empty($this->options['add_delta']) && (substr($field_name, -6) == '_value' || substr($field_name, -7) == '_value2')) {
       $this->query->add_field($table_name, 'delta');
-      $real_field_name = str_replace(array('_value', '_value2'), '', $this->real_field);
+      $real_field_name = str_replace(array('_value2', '_value'), '', $this->real_field);
       $this->query->add_field($table_name, 'entity_id', 'date_id_' . $real_field_name);
       $this->query->add_field($table_name, 'delta', 'date_delta_' . $real_field_name);
     }
@@ -149,7 +149,7 @@ class date_views_filter_handler_simple extends views_handler_filter_date {
     list($table_name, $field_name) = explode('.', $field);
     if (!empty($this->options['add_delta']) && (substr($field_name, -6) == '_value' || substr($field_name, -7) == '_value2')) {
       $this->query->add_field($table_name, 'delta');
-      $real_field_name = str_replace(array('_value', '_value2'), '', $this->real_field);
+      $real_field_name = str_replace(array('_value2', '_value'), '', $this->real_field);
       $this->query->add_field($table_name, 'entity_id', 'date_id_' . $real_field_name);
       $this->query->add_field($table_name, 'delta', 'date_delta_' . $real_field_name);
     }