--- sites/all/modules/date/includes/date_api_argument_handler.inc.orig
+++ sites/all/modules/date/includes/date_api_argument_handler.inc
@@ -341,8 +341,8 @@
       foreach ($this->query_fields as $query_field) {
         $field = $query_field['field'];
         $date_handler = $query_field['date_handler'];
-        $from_field = str_replace($field['table_name'] .'_', $field['table_name'] .'.', $field['fromto'][0]);
-        $to_field = str_replace($field['table_name'] .'_', $field['table_name'] .'.', $field['fromto'][1]);
+        $from_field = preg_replace('/^' . $field['table_name'] .'_/', $field['table_name'] .'.', $field['fromto'][0]);
+        $to_field = preg_replace('/^' . $field['table_name'] .'_/', $field['table_name'] .'.', $field['fromto'][1]);
         if ($this->options['relationship'] !== 'none') {
           $from_field = str_replace($field['table_name'] .'_', $this->relationship .'_'. $field['table_name'] .'.', $field['fromto'][0]);
           $to_field = str_replace($field['table_name'] .'_', $this->relationship .'_'.  $field['table_name'] .'.', $field['fromto'][1]);