Issue #2 - fixed bug with duplication of links