Stopwatch fix