fixed time zone issues