Patch to make node names work distributed