diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
index bbd58fb28d237d64b49074ff8f8ad9a7426e7981..4a349df4e997b00d2e51035b7ac84f30c6a3bede 100644
--- a/core/CHANGELOG.md
+++ b/core/CHANGELOG.md
@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-644 - Search crashed with index-type: flat
 - MS-624 - Search vectors failed if time ranges long enough
 - MS-652 - IVFSQH quantization double free
+- MS-650 - SQ8H index create issue
 
 ## Improvement
 - MS-552 - Add and change the easylogging library
diff --git a/core/src/scheduler/Scheduler.cpp b/core/src/scheduler/Scheduler.cpp
index 4b42c5ec8f1048fc209de6395ba90d65a5759f0b..19197b4168d64b2e8aacb7cb8dbe6ade79c51d01 100644
--- a/core/src/scheduler/Scheduler.cpp
+++ b/core/src/scheduler/Scheduler.cpp
@@ -97,7 +97,7 @@ void
 Scheduler::OnLoadCompleted(const EventPtr& event) {
     auto load_completed_event = std::static_pointer_cast<LoadCompletedEvent>(event);
     if (auto resource = event->resource_.lock()) {
-        //        resource->WakeupExecutor();
+        resource->WakeupExecutor();
 
         auto task_table_type = load_completed_event->task_table_item_->task->label()->Type();
         switch (task_table_type) {
diff --git a/core/src/scheduler/action/PushTaskToNeighbour.cpp b/core/src/scheduler/action/PushTaskToNeighbour.cpp
index 4e7dbf984fe747676b8ac1e71c6f5fbfebbb9602..67aeeaa87bd704d643dc766e8fbcc088d907c667 100644
--- a/core/src/scheduler/action/PushTaskToNeighbour.cpp
+++ b/core/src/scheduler/action/PushTaskToNeighbour.cpp
@@ -209,9 +209,9 @@ Action::SpecifiedResourceLabelTaskScheduler(ResourceMgrWPtr res_mgr, ResourcePtr
     } else {
         auto next_res_name = task->path().Next();
         auto next_res = res_mgr.lock()->GetResource(next_res_name);
-        //        if (event->task_table_item_->Move()) {
-        //            next_res->task_table().Put(task);
-        //        }
+//        if (event->task_table_item_->Move()) {
+//            next_res->task_table().Put(task);
+//        }
         event->task_table_item_->Move();
         next_res->task_table().Put(task);
     }
diff --git a/core/src/scheduler/resource/Resource.cpp b/core/src/scheduler/resource/Resource.cpp
index dd1557adf5721f775a782308d0ee042db138d521..8ee7ba0b1724d6d07bc6926a3a1a4b7f8328e790 100644
--- a/core/src/scheduler/resource/Resource.cpp
+++ b/core/src/scheduler/resource/Resource.cpp
@@ -116,23 +116,23 @@ Resource::pick_task_execute() {
     auto indexes = task_table_.PickToExecute(std::numeric_limits<uint64_t>::max());
     for (auto index : indexes) {
         // try to set one task executing, then return
-        //        if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {
-        //            if (task_table_[index]->task->path().Last() != name()) {
-        //                continue;
-        //            }
-        //        }
-        //
-        //        if (task_table_.Execute(index)) {
-        //            return task_table_.Get(index);
-        //        }
         if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {
-            if (task_table_.Get(index)->task->path().Current() == task_table_.Get(index)->task->path().Last() &&
-                task_table_.Get(index)->task->path().Last() == name()) {
-                if (task_table_.Execute(index)) {
-                    return task_table_.Get(index);
-                }
+            if (task_table_[index]->task->path().Last() != name()) {
+                continue;
             }
         }
+
+        if (task_table_.Execute(index)) {
+            return task_table_.Get(index);
+        }
+//        if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {
+//            if (task_table_.Get(index)->task->path().Current() == task_table_.Get(index)->task->path().Last() &&
+//                task_table_.Get(index)->task->path().Last() == name()) {
+//                if (task_table_.Execute(index)) {
+//                    return task_table_.Get(index);
+//                }
+//            }
+//        }
         // else try next
     }
     return nullptr;
@@ -188,6 +188,7 @@ Resource::executor_function() {
             if (task_item->task->Type() == TaskType::BuildIndexTask) {
                 BuildMgrInst::GetInstance()->Put();
                 ResMgrInst::GetInstance()->GetResource("cpu")->WakeupLoader();
+                ResMgrInst::GetInstance()->GetResource("disk")->WakeupLoader();
             }
 
             if (subscriber_) {