I think this fixes the timing bug