Fixed time zone calculation issue