[watcher] try to fix strange crash again