diff --git a/include/CL/opencl.hpp b/include/CL/opencl.hpp
index ba4edafb..1c43c2ce 100644
--- a/include/CL/opencl.hpp
+++ b/include/CL/opencl.hpp
@@ -11930,7 +11930,7 @@ class CommandBufferKhr : public detail::Wrapper<cl_command_buffer_khr>
         cl_int error = detail::errHandler(
             pfn_clCommandNDRangeKernelKHR(object_,
                 (command_queue != nullptr) ? (*command_queue)() : nullptr,
-                &properties[0],
+                properties.empty() ? nullptr : properties.data(),
                 kernel(),
                 (cl_uint) global.dimensions(),
                 offset.dimensions() != 0 ? (const size_type*) offset : nullptr,