Fix newwatcher

Fix issue #1