+ fix link creation
Merge pull request #559 from amikryukov/link-bug-fix

Link creation bug fix