Fix for long server names