diff --git a/honeybee_grasshopper_core/src/HB Faces by Type.py b/honeybee_grasshopper_core/src/HB Faces by Type.py
index 662a815..e07c40d 100644
--- a/honeybee_grasshopper_core/src/HB Faces by Type.py	
+++ b/honeybee_grasshopper_core/src/HB Faces by Type.py	
@@ -146,9 +146,12 @@ def add_face(face):
             for ap in obj.orphaned_apertures:
                 add_aperture(ap)
             for dr in obj.orphaned_doors:
-                add_door(dr)
-            outdoor_shades.extend(obj.orphaned_shades)
-            outdoor_shades.extend(obj.shade_meshes)
+                add_door(dr) 
+            for shade in obj.shades:
+                if shade.is_indoor:
+                    indoor_shades.append(shade)
+                elif shade.is_indoor == False:
+                    outdoor_shades.append(shade)
         elif isinstance(obj, Room):
             add_shade(obj)
             for face in obj:
@@ -162,4 +165,4 @@ def add_face(face):
         elif isinstance(obj, Shade):
             outdoor_shades.append(obj)
         elif isinstance(obj, ShadeMesh):
-            outdoor_shades.append(obj)
\ No newline at end of file
+            outdoor_shades.append(obj)
diff --git a/honeybee_grasshopper_core/user_objects/HB Faces by Type.ghuser b/honeybee_grasshopper_core/user_objects/HB Faces by Type.ghuser
index c5c9c22..5b51110 100644
Binary files a/honeybee_grasshopper_core/user_objects/HB Faces by Type.ghuser and b/honeybee_grasshopper_core/user_objects/HB Faces by Type.ghuser differ