Fix Watcher on 3.x