template watch fix