Fix stopwatch bug