diff --git a/core/src/scheduler/job/BuildIndexJob.cpp b/core/src/scheduler/job/BuildIndexJob.cpp
index 4c4c3b5054d82c16d9c13547816f3e2dd82912d1..3247383db3c12d075e1764f9053a10a43d4bbeec 100644
--- a/core/src/scheduler/job/BuildIndexJob.cpp
+++ b/core/src/scheduler/job/BuildIndexJob.cpp
@@ -50,7 +50,10 @@ void
 BuildIndexJob::BuildIndexDone(size_t to_index_id) {
     std::unique_lock<std::mutex> lock(mutex_);
     to_index_files_.erase(to_index_id);
-    cv_.notify_all();
+    if (to_index_files_.empty()) {
+        cv_.notify_all();
+    }
+
     SERVER_LOG_DEBUG << "BuildIndexJob " << id() << " finish index file: " << to_index_id;
 }
 
diff --git a/core/src/scheduler/job/SearchJob.cpp b/core/src/scheduler/job/SearchJob.cpp
index ee41c1ae0605b1e2a32566f09f1986b0c5291287..ec93c69f55f4512d14763695433a580f2f13f829 100644
--- a/core/src/scheduler/job/SearchJob.cpp
+++ b/core/src/scheduler/job/SearchJob.cpp
@@ -49,7 +49,10 @@ void
 SearchJob::SearchDone(size_t index_id) {
     std::unique_lock<std::mutex> lock(mutex_);
     index_files_.erase(index_id);
-    cv_.notify_all();
+    if (index_files_.empty()) {
+        cv_.notify_all();
+    }
+
     SERVER_LOG_DEBUG << "SearchJob " << id() << " finish index file: " << index_id;
 }
 
diff --git a/core/src/wrapper/ConfAdapter.cpp b/core/src/wrapper/ConfAdapter.cpp
index 2dcf6bab7e1a0c9ccb354a5bcd46ebce9dffca27..a27bceecbbbf67d5aec6ce5def13356c2e071477 100644
--- a/core/src/wrapper/ConfAdapter.cpp
+++ b/core/src/wrapper/ConfAdapter.cpp
@@ -109,7 +109,7 @@ IVFSQConfAdapter::Match(const TempMetaConf& metaconf) {
     conf->nlist = MatchNlist(metaconf.size, metaconf.nlist);
     conf->d = metaconf.dim;
     conf->metric_type = metaconf.metric_type;
-    conf->gpu_id = conf->gpu_id;
+    conf->gpu_id = metaconf->gpu_id;
     conf->nbits = 8;
     MatchBase(conf);
     return conf;