Fix watchers validator like in stable branch