watchOnce: Avoid defunct goroutine
watchOnce: Avoid defunct goroutines and fix a race condition