Fix time zone issue for date format