Fixes unwatch