Sort out the date issue