fix bugs on time zone support