Second attempt at link-fixing