#941990 by master-of-magic: Link to node when using relationships could occasionally lose track and create bad links.