fixing issues about links