fixed watchers generating a exception ( we really need unit testing )