EventModel, NodeWatcher bug workaround