Fixed date bug