fix time zone issue