[michael] Timing error fix