[#2282] Adding some linking, thanks to @WouterJ