diff --git a/include/osg/Drawable b/include/osg/Drawable
index 0c828e828..13be012c0 100644
--- a/include/osg/Drawable
+++ b/include/osg/Drawable
@@ -532,7 +532,7 @@ inline void Drawable::draw(RenderInfo& renderInfo) const
 
 
 #ifdef OSG_GL_DISPLAYLISTS_AVAILABLE
-    if (_useDisplayList)
+    if (!state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects) && _useDisplayList)
     {
         // get the contextID (user defined ID of 0 upwards) for the
         // current OpenGL context.
diff --git a/src/osg/Drawable.cpp b/src/osg/Drawable.cpp
index 4800530fc..aa3ea1680 100644
--- a/src/osg/Drawable.cpp
+++ b/src/osg/Drawable.cpp
@@ -595,7 +595,7 @@ void Drawable::compileGLObjects(RenderInfo& renderInfo) const
 {
 
 #ifdef OSG_GL_DISPLAYLISTS_AVAILABLE
-    if (_useDisplayList)
+    if (!renderInfo.getState()->useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects) && _useDisplayList)
     {
         // get the contextID (user defined ID of 0 upwards) for the
         // current OpenGL context.
@@ -624,7 +624,6 @@ void Drawable::compileGLObjects(RenderInfo& renderInfo) const
 
 void Drawable::draw(RenderInfo& renderInfo) const
 {
-    // OSG_NOTICE<<"Geometry::draw() "<<this<<std::endl;
 
     State& state = *renderInfo.getState();
     bool useVertexArrayObject = state.useVertexArrayObject(_useVertexArrayObject);
@@ -661,7 +660,7 @@ void Drawable::draw(RenderInfo& renderInfo) const
 
 
 #ifdef OSG_GL_DISPLAYLISTS_AVAILABLE
-    if (_useDisplayList)
+    if (!state.useVertexBufferObject(_supportsVertexBufferObjects && _useVertexBufferObjects) && _useDisplayList)
     {
         // get the contextID (user defined ID of 0 upwards) for the
         // current OpenGL context.
diff --git a/src/osg/Geometry.cpp b/src/osg/Geometry.cpp
index c690fcb7a..58960df3c 100644
--- a/src/osg/Geometry.cpp
+++ b/src/osg/Geometry.cpp
@@ -785,7 +785,7 @@ void Geometry::compileGLObjects(RenderInfo& renderInfo) const
 
 void Geometry::drawImplementation(RenderInfo& renderInfo) const
 {
-    // OSG_NOTICE<<" Geometry::drawImplementation()"<<std::endl;
+    // OSG_NOTICE<<"Geometry::drawImplementation() "<<this<<std::endl;
 
     if (_containsDeprecatedData)
     {
diff --git a/src/osg/State.cpp b/src/osg/State.cpp
index 0ce9f2fae..7eb738653 100644
--- a/src/osg/State.cpp
+++ b/src/osg/State.cpp
@@ -181,6 +181,9 @@ void State::initializeExtensionProcs()
     _forceVertexArrayObject = _isVertexArrayObjectSupported && (ds->getVertexBufferHint()==DisplaySettings::VERTEX_ARRAY_OBJECT);
     _forceVertexBufferObject = _forceVertexArrayObject || (_isVertexBufferObjectSupported && (ds->getVertexBufferHint()==DisplaySettings::VERTEX_BUFFER_OBJECT));
 
+    OSG_NOTICE<<"_forceVertexArrayObject = "<<_forceVertexArrayObject<<std::endl;
+    OSG_NOTICE<<"_forceVertexBufferObject = "<<_forceVertexBufferObject<<std::endl;
+
 
     // Set up up global VertexArrayState object
     _globalVertexArrayState = new VertexArrayState(this);