diff --git a/src/backing_store_tuner.c b/src/backing_store_tuner.c
index 067c05f..13f7ec3 100644
--- a/src/backing_store_tuner.c
+++ b/src/backing_store_tuner.c
@@ -109,7 +109,7 @@ xPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
     private->PostValidateTreeNestingLevel++;
 
     /* Disable backing store for the focus window */
-    if (!private->ForceBackingStore && focusWin->backStorage) {
+    if (!private->ForceBackingStore && (focusWin->backingStore != NotUseful)) {
         DebugMsg("Disable backing store for the focus window 0x%x\n",
                  (unsigned int)focusWin->drawable.id);
         pScreen->backingStoreSupport = Always;
@@ -125,7 +125,7 @@ xPostValidateTree(WindowPtr pWin, WindowPtr pLayerWin, VTKind kind)
     /* And enable backing store for all the other children of root */
     curWin = pScreen->root->firstChild;
     while (curWin) {
-        if (!curWin->backStorage && (private->ForceBackingStore ||
+        if ((curWin->backingStore == NotUseful) && (private->ForceBackingStore ||
                                      curWin != focusWin)) {
             DebugMsg("Enable backing store for window 0x%x\n",
                      (unsigned int)curWin->drawable.id);
@@ -158,7 +158,7 @@ xReparentWindow(WindowPtr pWin, WindowPtr pPriorParent)
     }
 
     /* We only want backing store set for direct children of root */
-    if (pPriorParent == pScreen->root && pWin->backStorage) {
+    if (pPriorParent == pScreen->root && (pWin->backingStore != NotUseful)) {
         DebugMsg("Reparent window 0x%x from root, disabling backing store\n",
                  (unsigned int)pWin->drawable.id);
         pScreen->backingStoreSupport = Always;
--
2.16.2
