bring inline latest changes

fixes OpenGL compability