fixed time zone issue