Fix watch task first time run issue