fixed date-time bug