Correct date handling