repair watcher-to-following migration problem