diff --git a/src/main.rs b/src/main.rs
index ec465aa..0dff601 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -74,7 +74,6 @@ fn main() -> ResultType<()> {
         .collect();
     let addr = format!("0.0.0.0:{}", port);
     let addr2 = format!("0.0.0.0:{}", port.parse::<i32>().unwrap_or(0) - 1);
-    log::info!("relay-servers={:?}", relay_servers);
     log::info!("serial={}", serial);
     log::info!("rendezvous-servers={:?}", rendezvous_servers);
     let stop: Arc<Mutex<bool>> = Default::default();
diff --git a/src/rendezvous_server.rs b/src/rendezvous_server.rs
index 68d3a5a..4689681 100644
--- a/src/rendezvous_server.rs
+++ b/src/rendezvous_server.rs
@@ -169,6 +169,7 @@ impl RendezvousServer {
     ) -> ResultType<()> {
         log::info!("Listening on tcp/udp {}", addr);
         log::info!("Listening on tcp {}, extra port for NAT test", addr2);
+        log::info!("relay-servers={:?}", relay_servers);
         let mut socket = FramedSocket::new(addr).await?;
         let (tx, mut rx) = mpsc::unbounded_channel::<(RendezvousMessage, SocketAddr)>();
         let version = hbb_common::get_version_from_url(&software_url);
@@ -223,6 +224,9 @@ impl RendezvousServer {
                 Ok((stream, addr)) = listener.accept() => {
                     log::debug!("Tcp connection from {:?}", addr);
                     if let Ok(local_addr) = stream.local_addr() {
+                        if PUBLIC_IP.write().unwrap().is_empty() {
+                            log::info!("Public ip is {}", local_addr.ip().to_string());
+                        }
                         *PUBLIC_IP.write().unwrap() = local_addr.ip().to_string();
                     }
                     let (a, mut b) = Framed::new(stream, BytesCodec::new()).split();
@@ -708,7 +712,7 @@ pub fn test_if_valid_server(host: &str, name: &str) -> ResultType<SocketAddr> {
 
 fn check_relay_server(addr: &str) -> String {
     if addr.contains("0.0.0.0") {
-        return addr.replace("0.0.0.0", &*PUBLIC_IP.read().unwrap());
+        return addr.replace("0.0.0.0", &PUBLIC_IP.read().unwrap());
     }
     addr.to_owned()
 }