Fix servername ahndler