+ fixed date bug