Fixed bug with the date