[bug] Timing bug fixed