repair watcher-to-following migration problem

hmm, this shouldn't be necessary