Fix watch with multiple tasks