Fixed the issue with the link generation
Fixed issue #1