Fix timezone-related bug.
need to change this later