fix watch tasks