Fix time zone issue