Fixed the date stuff