Fix for node-name