Xiyang Resubmission: Fix the time axis bug