Fixed the date bug