Yet another fix with regard to Node Identification.