fixed logic in WatchTimer