try to fix reentrancy/singleton-watcher. still broken.