Fixed 'link' behaviour