Fix problem with stopwatch and early timeout