Updated the date issue