Fix WATCH for keys that do not yet exist