Fix next node RE/IRE checking