diff --git a/src/cpp/cuda.hpp b/src/cpp/cuda.hpp
index 1f49f9d9aedc6b614599416acb201db52853b71f..da60bd5756508e599cb2c54d643e4c0f60d17036 100644
--- a/src/cpp/cuda.hpp
+++ b/src/cpp/cuda.hpp
@@ -497,7 +497,7 @@ namespace pycuda
   inline
   void init(unsigned int flags)
   {
-    CUDAPP_CALL_GUARDED(cuInit, (flags));
+    CUDAPP_CALL_GUARDED_THREADED(cuInit, (flags));
   }
 
   inline
@@ -822,7 +822,7 @@ namespace pycuda
     context::prepare_context_switch();
 
     CUcontext ctx;
-    CUDAPP_CALL_GUARDED(cuCtxCreate, (&ctx, flags, m_device));
+    CUDAPP_CALL_GUARDED_THREADED(cuCtxCreate, (&ctx, flags, m_device));
     boost::shared_ptr<context> result(new context(ctx));
     context_stack::get().push(result);
     return result;