Bug fix for stopwatch controls