fix time zone issues