Fixed the date issue