Timing fix