I see your point, the watcher must be removed here and not after the loop. Will push a fix