potential fix for time zone calc