diff --git a/src/blenderbim/blenderbim/bim/module/brick/prop.py b/src/blenderbim/blenderbim/bim/module/brick/prop.py
index ae1b4d8fd8..87e882b364 100644
--- a/src/blenderbim/blenderbim/bim/module/brick/prop.py
+++ b/src/blenderbim/blenderbim/bim/module/brick/prop.py
@@ -47,13 +47,13 @@ def get_namespaces(self, context):
 
 
 def get_brick_entity_classes(self, context):
-    entity = context.scene.BIMBrickProperties.brick_entity_create_type
+    entity = self.brick_entity_create_type
     return BrickStore.entity_classes[entity]
 
 
-def get_brick_roots(self, context):
-    return BrickStore.root_classes
-            
+def get_brick_roots(self, context): 
+    return [(root, root, "") for root in BrickStore.root_classes]
+
 
 class Brick(PropertyGroup):
     name: StringProperty(name="Name")
diff --git a/src/blenderbim/blenderbim/tool/brick.py b/src/blenderbim/blenderbim/tool/brick.py
index 6723ba997a..14ff636ec6 100644
--- a/src/blenderbim/blenderbim/tool/brick.py
+++ b/src/blenderbim/blenderbim/tool/brick.py
@@ -345,7 +345,7 @@ class BrickStore:
     current_changesets = 0
     history_size = 64
     namespaces = []
-    root_classes = [("Equipment", "Equipment", ""), ("Location", "Location", ""), ("System", "System", ""), ("Point", "Point", "")]
+    root_classes = ["Equipment", "Location", "System", "Point"]
     entity_classes = {}
 
     @staticmethod
@@ -376,7 +376,7 @@ class BrickStore:
     @classmethod
     def load_entity_classes(cls):
         
-        for root_class, __, __ in BrickStore.root_classes:
+        for root_class in BrickStore.root_classes:
             query = BrickStore.graph.query(
                 """
                 PREFIX brick: <https://brickschema.org/schema/Brick#>