Fixes duplicate nodename warning.  Closes #2046