diff --git a/openglgeometrybank.cpp b/openglgeometrybank.cpp
index 2167ca7a..011553e4 100644
--- a/openglgeometrybank.cpp
+++ b/openglgeometrybank.cpp
@@ -130,6 +130,7 @@ opengl_vbogeometrybank::create_( geometry_handle const &Geometry ) {
     // kiss the existing buffer goodbye, new overall data size means we'll be making a new one
     delete_buffer();
 
+	bind_streams(stream::none);
 	glGenVertexArrays(1, &m_vao);
 }
 
@@ -173,7 +174,6 @@ opengl_vbogeometrybank::draw_( geometry_handle const &Geometry, unsigned int con
         bind_buffer();
         // NOTE: we're using static_draw since it's generally true for all we have implemented at the moment
         // TODO: allow to specify usage hint at the object creation, and pass it here
-		m_activestreams = stream::none;
         ::glBufferData(
             GL_ARRAY_BUFFER,
             datasize * sizeof( basic_vertex ),
@@ -224,6 +224,7 @@ opengl_vbogeometrybank::bind_buffer() {
 	glBindVertexArray(m_vao);
     ::glBindBuffer( GL_ARRAY_BUFFER, m_buffer );
     m_activebuffer = m_buffer;
+	bind_streams(stream::none);
 }
 
 void