Node ID bug fixed