Fix watcher not updating to reflect certain changes

Fixes #332.