Fixed problem where restoring state would have a watch that kept running.