Fix server_name issue