Fix watch task