fixed watchers