Fixing neighbor link generation