fixed date bug