Fixed a date bug again