Fix invalid task on watch