Fix for NMS-6084 - hanging node name doesn't work