diff --git a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
index 5e028fb..10b0051 100644
--- a/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
+++ b/stimBuffApis/livoxGen1/openClCollatingAndMeshingEngine.cpp
@@ -562,23 +562,8 @@ bool OpenClCollatingAndMeshingEngine::setupCollateDgramsArgs(
 
 void OpenClCollatingAndMeshingEngine::stop()
 {
-	// Stop compact kernel if running
-	if (compactIsRunning && currentCompactKernelEvent)
-	{
-		clWaitForEvents(1, &currentCompactKernelEvent);
-		clReleaseEvent(currentCompactKernelEvent);
-		currentCompactKernelEvent = nullptr;
-		compactIsRunning = false;
-	}
-
-	// Stop collate kernel if running
-	if (collateIsRunning && currentCollateKernelEvent)
-	{
-		clWaitForEvents(1, &currentCollateKernelEvent);
-		clReleaseEvent(currentCollateKernelEvent);
-		currentCollateKernelEvent = nullptr;
-		collateIsRunning = false;
-	}
+	stopCompactKernel();
+	stopCollateKernel();
 }
 
 void OpenClCollatingAndMeshingEngine::stopCompactKernel()