Upcoming not listing all events in correct order

I created 2 'content types' both have a different cck date field. The field on the first content type allows repeating, the field on the second does not....

I created an upcoming block and selected both dates in the filter part with the OR operator

this creates the following in the query: ORDER BY node_data_field_date_field_date_value ASC, node_data_field_repeatdate_field_repeatdate_value ASC

This first sorts on node_data_field_date_field_date_value using 'NULL' for the nodes using the node_data_field_repeatdate_field_repeatdate_value field making the sort unreliable and incorrect in order