fix timezone bug (need backcompatibility testing)