Adjusting node detection to take into account the system node