Slightly different fix for preventing depulicate SystemSystem links