--- date_api_argument_handler.inc	2010-08-13 10:32:58.000000000 +1200
+++ date_api_argument_handler.inc.new	2010-09-04 12:52:04.019141000 +1200
@@ -273,7 +273,7 @@ class date_api_argument_handler extends 
     if (!empty($this->query_fields)) {
       foreach ($this->query_fields as $query_field) {
         $field = $query_field['field'];
-        $this->related_table_alias = $this->query->queue_table($field['table_name'], $this->relationship);
+        $this->related_table_alias[$field['table_name']] = $this->query->queue_table($field['table_name'], $this->relationship);
       }
     }
   }
@@ -349,7 +349,10 @@ class date_api_argument_handler extends 
       foreach ($this->query_fields as $query_field) {
         $field = $query_field['field'];
         $date_handler = $query_field['date_handler'];
-        $table_alias = !empty($this->related_table_alias) ? $this->related_table_alias : $field['table_name'];
+        $table_alias = $this->related_table_alias[$field['table_name']];
+        if (!$table_alias) {
+		  $table_alias = $field['table_name'];
+	    }
         $from_field = str_replace($field['table_name'] .'_', $table_alias .'.', $field['fromto'][0]);
         $to_field = str_replace($field['table_name'] .'_', $table_alias .'.', $field['fromto'][1]);