Fix bug in link support

Sorry about that guys, will work this week on some unit tests.