diff --git a/core/src/scheduler/TaskTable.cpp b/core/src/scheduler/TaskTable.cpp
index 90996dc549..27fb4ba52c 100644
--- a/core/src/scheduler/TaskTable.cpp
+++ b/core/src/scheduler/TaskTable.cpp
@@ -180,6 +180,8 @@ TaskTable::PickToLoad(uint64_t limit) {
             cross = true;
             indexes.push_back(index);
             ++pick_count;
+        } else {
+            cross = true;
         }
     }
     // rc.ElapseFromBegin("PickToLoad ");
@@ -252,6 +254,8 @@ TaskTable::PickToExecute(uint64_t limit) {
             cross = true;
             indexes.push_back(index);
             ++pick_count;
+        } else {
+            cross = true;
         }
     }
     // rc.ElapseFromBegin("PickToExecute ");
diff --git a/core/src/scheduler/resource/Resource.cpp b/core/src/scheduler/resource/Resource.cpp
index 395a48d72b..bd6fd889f9 100644
--- a/core/src/scheduler/resource/Resource.cpp
+++ b/core/src/scheduler/resource/Resource.cpp
@@ -172,10 +172,14 @@ Resource::loader_function() {
             }
             LoadFile(task_item->task);
             task_item->Loaded();
-            if (task_item->from) {
-                task_item->from->Moved();
-                task_item->from->task = FinishedTask::Create(task_item->from->task);
-                task_item->from = nullptr;
+
+            auto& label = task_item->task->label();
+            if (label != nullptr && label->Type() != TaskLabelType::BROADCAST) {
+                if (task_item->from) {
+                    task_item->from->Moved();
+                    task_item->from->task = FinishedTask::Create(task_item->from->task);
+                    task_item->from = nullptr;
+                }
             }
             if (subscriber_) {
                 auto event = std::make_shared<LoadCompletedEvent>(shared_from_this(), task_item);
diff --git a/core/unittest/CMakeLists.txt b/core/unittest/CMakeLists.txt
index a3d085a146..3709efc18f 100644
--- a/core/unittest/CMakeLists.txt
+++ b/core/unittest/CMakeLists.txt
@@ -222,8 +222,6 @@ if (MILVUS_GPU_VERSION)
     link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")
     set(unittest_libs ${unittest_libs}
             ${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs/libnvidia-ml.so
-            cudart
-            cublas
             )
 endif ()