Default watchers issue fixed