Fix with watchers inner class