Applied patch from theodi:bugfix-15-two-nodes