diff --git a/libs/main/opencl/piopencl.h b/libs/main/opencl/piopencl.h
index 4d9fbc7c..dec2343d 100644
--- a/libs/main/opencl/piopencl.h
+++ b/libs/main/opencl/piopencl.h
@@ -284,6 +284,7 @@ public:
 	public:
 		Program * program() const { return program_; }
 		bool execute();
+		void waitForFinish();
 		void setExecuteRange(int size) { setExecuteRanges(PIVector<int>() << size); }
 		void setExecuteRanges(const PIVector<int> & ranges);
 		const PIString & name() const { return name_; }
diff --git a/libs/opencl/piopencl.cpp b/libs/opencl/piopencl.cpp
index 8b368d87..017852e4 100644
--- a/libs/opencl/piopencl.cpp
+++ b/libs/opencl/piopencl.cpp
@@ -517,6 +517,11 @@ bool PIOpenCL::Kernel::execute() {
 }
 
 
+void PIOpenCL::Kernel::waitForFinish() {
+	clFinish(context_->PRIVATEWB->queue);
+}
+
+
 void PIOpenCL::Kernel::setExecuteRanges(const PIVector<int> & ranges) {
 	dims = ranges.toType<size_t>();
 }