Update Timing fix