Fixes bug with links in workspace model
Merge pull request #895 from kitan1982/workspace-model-bugfix

Fixes bug with links in workspace model