Fixed unwatch()