Fixes time zone conversion issues