fixed unwatch problem