2 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/programs/Xserver/composite/compalloc.c b/nx-X11/programs/Xserver/composite/compalloc.c
index 9279a5248..017459b6b 100644
--- a/nx-X11/programs/Xserver/composite/compalloc.c
+++ b/nx-X11/programs/Xserver/composite/compalloc.c
@@ -32,7 +32,7 @@ static void
 compScreenUpdate(ScreenPtr pScreen)
 {
     compCheckTree(pScreen);
-    compPaintChildrenToWindow(pScreen, WindowTable[pScreen->myNum]);
+    compPaintChildrenToWindow(pScreen, pScreen->root);
 }
 
 static void
diff --git a/nx-X11/programs/Xserver/composite/compoverlay.c b/nx-X11/programs/Xserver/composite/compoverlay.c
index dfe59f3cf..226bbcb6a 100644
--- a/nx-X11/programs/Xserver/composite/compoverlay.c
+++ b/nx-X11/programs/Xserver/composite/compoverlay.c
@@ -129,7 +129,7 @@ Bool
 compCreateOverlayWindow(ScreenPtr pScreen)
 {
     CompScreenPtr cs = GetCompScreen(pScreen);
-    WindowPtr pRoot = WindowTable[pScreen->myNum];
+    WindowPtr pRoot = pScreen->root;
     WindowPtr pWin;
     XID attrs[] = { None, TRUE };       /* backPixmap, overrideRedirect */
     int result;