fix unwatch bug