Fixed date bug hopefully