Makes change to more reliably reset watching