Fixed another bug in handling links.