diff --git a/mi/mibitblt.c b/mi/mibitblt.c
index 84f8da65a..dbfc73a4f 100644
--- a/mi/mibitblt.c
+++ b/mi/mibitblt.c
@@ -98,7 +98,7 @@ miCopyArea(DrawablePtr pSrcDrawable,
 
     /* If the destination is clipped away, this is easy */
     if (pDstDrawable->type == DRAWABLE_WINDOW &&
-        RegionNil(&((WindowPtr)pDstDrawable)->clipList))
+        RegionNil(pGC->pCompositeClip))
         return NULL;
 
     /* clip the source */
diff --git a/mi/micopy.c b/mi/micopy.c
index 4db128c4f..d563ea682 100644
--- a/mi/micopy.c
+++ b/mi/micopy.c
@@ -154,7 +154,7 @@ miDoCopy(DrawablePtr pSrcDrawable,
 
     /* Short cut for unmapped or fully clipped windows */
     if (pDstDrawable->type == DRAWABLE_WINDOW &&
-        RegionNil(&((WindowPtr)pDstDrawable)->clipList)) {
+        RegionNil(pGC->pCompositeClip)) {
         return NULL;
     }