Another try at fixing the named links