Correcting handling of links