Fixed #44

Circularity no longer breaks watchers