Fixing the link bug