Hotfix/link plugin

Hotfix/link plugin