NodeId bug corrected