fix in link handling