unwatch and and name watch fix