fixed date handling