#169 Making the link explicit