diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index 2bc8e01..26aa0e0 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -104,8 +104,8 @@ validGlxVisual(ClientPtr client, __GLXscreen *pGlxScreen, XID id,
 {
     int i;
 
-    for (i = 0; i < pGlxScreen->numVisuals; i++)
-       if (pGlxScreen->visuals[i]->visualID == id) {
+    for (i = 0; i < pGlxScreen->pScreen->numVisuals; i++)
+       if (pGlxScreen->pScreen->visuals[i].vid == id) {
            *config = pGlxScreen->visuals[i];
            return TRUE;
        }
@@ -916,7 +916,7 @@ int __glXDisp_GetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
        modes = pGlxScreen->visuals[i];
 
        p = 0;
-       buf[p++] = modes->visualID;
+       buf[p++] = pGlxScreen->pScreen->visuals[i].vid;
        buf[p++] = glxConvertToXVisualType( modes->visualType );
        buf[p++] = modes->rgbMode;