time zone fix
TODO: Time Zone support!