a.o. bugfix for NodeEvent change