Timing fixup