Bugfix on server linking