Fix StopWatch