Fixed Server_name issue