Fix remove inheriting wrong link in hard cases