fix the date issue