Bug fixing -- time zone set