Attempt fix to timing bug