Fix: timing fix