Fix regression in #932 that broke watching