diff --git a/src/Engine_Object.cc b/src/Engine_Object.cc
index d690ebd..ddaa35a 100644
--- a/src/Engine_Object.cc
+++ b/src/Engine_Object.cc
@@ -527,6 +527,7 @@ void Engine::Object::draw()
         }
         else
         {
+            m_obj->bindBuffers();
             GLuint program = m_engine.m_programs[PROG_OBJ];
             glUseProgram(program);
 
@@ -610,6 +611,8 @@ void Engine::Object::draw()
                 glDrawElements(GL_TRIANGLES, m.num_vertices,
                         GL_UNSIGNED_SHORT,
                         (GLvoid *) (sizeof(GLushort) * m.first_vertex));
+                glBindBuffer(GL_ARRAY_BUFFER, 0);
+                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
             }
         }