Fix for long server names

Here is the updated fix with just 1 commit :)