Fix recursive watch bug on less watch task