resolve issue with time zone