diff --git a/common.h b/common.h
index 80778a0..1348799 100644
--- a/common.h
+++ b/common.h
@@ -67,7 +67,7 @@ const u32_t conv_clear_interval=200;
 const u32_t timer_interval=400;
 const int conv_clear_ratio=40;
 const int conv_clear_min=5;
-const u32_t conv_timeout=20000;
+const u32_t conv_timeout=180000;
 const int max_conv_num=10000;
 
 /*
diff --git a/main.cpp b/main.cpp
index e86b837..a5652b9 100644
--- a/main.cpp
+++ b/main.cpp
@@ -283,8 +283,8 @@ struct conn_manager_t  //TODO change map to unordered map
 			}
 			cnt++;
 		}
-		return 0;
 		clear_it=it;
+		return 0;
 	}
 }conn_manager;