fixed regression on node id matching