Fixing incorrect inter-linking