Hotfix/bug server assignment