diff --git a/volatility/framework/symbols/windows/extensions/__init__.py b/volatility/framework/symbols/windows/extensions/__init__.py
index c60e625db..d77e0ccdb 100644
--- a/volatility/framework/symbols/windows/extensions/__init__.py
+++ b/volatility/framework/symbols/windows/extensions/__init__.py
@@ -120,14 +120,15 @@ class MMVAD_SHORT(objects.StructType):
         elif self.has_member("Right"):
             return self.Right
 
+        # this is for windows 8 and 10
         elif self.has_member("VadNode"):
             if self.VadNode.has_member("RightChild"):
                 return self.VadNode.RightChild
             if self.VadNode.has_member("Right"):
                 return self.VadNode.Right
 
-        # if to avoid MMVAD that has both
-        if self.has_member("Core"):
+        # also for windows 8 and 10
+        elif self.has_member("Core"):
             if self.Core.has_member("VadNode"):
                 if self.Core.VadNode.has_member("RightChild"):
                     return self.Core.VadNode.RightChild
@@ -145,14 +146,15 @@ class MMVAD_SHORT(objects.StructType):
         elif self.has_member("Left"):
             return self.Left
 
+        # this is for windows 8 and 10
         elif self.has_member("VadNode"):
             if self.VadNode.has_member("LeftChild"):
                 return self.VadNode.LeftChild
             if self.VadNode.has_member("Left"):
                 return self.VadNode.Left
 
-        # if to avoid MMVAD that has both
-        if self.has_member("Core"):
+        # also for windows 8 and 10
+        elif self.has_member("Core"):
             if self.Core.has_member("VadNode"):
                 if self.Core.VadNode.has_member("LeftChild"):
                     return self.Core.VadNode.LeftChild