Fix current date handling