Merge pull request #419 from mwarning/nds_link_fix