fixing the date issue