fixed the date issue