diff --git a/src/DivaGL/gl_array_buffer.hpp b/src/DivaGL/gl_array_buffer.hpp
index 3c64b6c..c36a32a 100644
--- a/src/DivaGL/gl_array_buffer.hpp
+++ b/src/DivaGL/gl_array_buffer.hpp
@@ -39,7 +39,7 @@ public:
         }
         else {
             glGenBuffers(1, &buffer);
-            gl_state_bind_array_buffer(buffer);
+            gl_state_bind_array_buffer(buffer, true);
             if (GL_VERSION_4_4)
                 glBufferStorage(GL_ARRAY_BUFFER, (GLsizeiptr)size,
                     0, GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT);
@@ -59,7 +59,7 @@ public:
         }
         else {
             glGenBuffers(1, &buffer);
-            gl_state_bind_array_buffer(buffer);
+            gl_state_bind_array_buffer(buffer, true);
             if (GL_VERSION_4_4)
                 glBufferStorage(GL_ARRAY_BUFFER, (GLsizeiptr)size, data,
                     dynamic ? GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT : 0);
diff --git a/src/DivaGL/gl_element_array_buffer.hpp b/src/DivaGL/gl_element_array_buffer.hpp
index 08cb61e..4440028 100644
--- a/src/DivaGL/gl_element_array_buffer.hpp
+++ b/src/DivaGL/gl_element_array_buffer.hpp
@@ -35,7 +35,7 @@ public:
         }
         else {
             glGenBuffers(1, &buffer);
-            gl_state_bind_element_array_buffer(buffer);
+            gl_state_bind_element_array_buffer(buffer, true);
             if (GL_VERSION_4_4)
                 glBufferStorage(GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)size,
                     0, GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT);
@@ -55,7 +55,7 @@ public:
         }
         else {
             glGenBuffers(1, &buffer);
-            gl_state_bind_element_array_buffer(buffer);
+            gl_state_bind_element_array_buffer(buffer, true);
             if (GL_VERSION_4_4)
                 glBufferStorage(GL_ELEMENT_ARRAY_BUFFER, (GLsizeiptr)size, data,
                     dynamic ? GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT : 0);
diff --git a/src/DivaGL/gl_shader_storage_buffer.hpp b/src/DivaGL/gl_shader_storage_buffer.hpp
index 930f6dd..e7e4db7 100644
--- a/src/DivaGL/gl_shader_storage_buffer.hpp
+++ b/src/DivaGL/gl_shader_storage_buffer.hpp
@@ -35,7 +35,7 @@ public:
         }
         else {
             glGenBuffers(1, &buffer);
-            gl_state_bind_shader_storage_buffer(buffer);
+            gl_state_bind_shader_storage_buffer(buffer, true);
             if (GL_VERSION_4_4)
                 glBufferStorage(GL_SHADER_STORAGE_BUFFER, (GLsizeiptr)size,
                     0, GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT);
@@ -55,7 +55,7 @@ public:
         }
         else {
             glGenBuffers(1, &buffer);
-            gl_state_bind_shader_storage_buffer(buffer);
+            gl_state_bind_shader_storage_buffer(buffer, true);
             if (GL_VERSION_4_4)
                 glBufferStorage(GL_SHADER_STORAGE_BUFFER, (GLsizeiptr)size, data,
                     dynamic ? GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT : 0);
diff --git a/src/DivaGL/gl_uniform_buffer.hpp b/src/DivaGL/gl_uniform_buffer.hpp
index 83f12a6..0da7adb 100644
--- a/src/DivaGL/gl_uniform_buffer.hpp
+++ b/src/DivaGL/gl_uniform_buffer.hpp
@@ -35,7 +35,7 @@ public:
         }
         else {
             glGenBuffers(1, &buffer);
-            gl_state_bind_uniform_buffer(buffer);
+            gl_state_bind_uniform_buffer(buffer, true);
             if (GL_VERSION_4_4)
                 glBufferStorage(GL_UNIFORM_BUFFER, (GLsizeiptr)size,
                     0, GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT);
@@ -55,7 +55,7 @@ public:
         }
         else {
             glGenBuffers(1, &buffer);
-            gl_state_bind_uniform_buffer(buffer);
+            gl_state_bind_uniform_buffer(buffer, true);
             if (GL_VERSION_4_4)
                 glBufferStorage(GL_UNIFORM_BUFFER, (GLsizeiptr)size, data,
                     dynamic ? GL_DYNAMIC_STORAGE_BIT | GL_MAP_WRITE_BIT : 0);