Fix watcher's unique id generation once again