diff --git a/src/blenderbim/blenderbim/bim/module/model/opening.py b/src/blenderbim/blenderbim/bim/module/model/opening.py
index da6cfeced3..739c0feff8 100644
--- a/src/blenderbim/blenderbim/bim/module/model/opening.py
+++ b/src/blenderbim/blenderbim/bim/module/model/opening.py
@@ -47,6 +47,7 @@ class AddFilledOpening(bpy.types.Operator, tool.Ifc.Operator):
 
     def _execute(self, context):
         props = context.scene.BIMModelProperties
+        unit_scale = ifcopenshell.util.unit.calculate_unit_scale(tool.Ifc.get())
 
         voided_obj = bpy.data.objects.get(self.voided_obj)
         filling_obj = bpy.data.objects.get(self.filling_obj)
@@ -75,7 +76,7 @@ class AddFilledOpening(bpy.types.Operator, tool.Ifc.Operator):
             if container:
                 container_obj = tool.Ifc.get_object(container)
                 if container_obj:
-                    new_matrix[2][3] = container_obj.matrix_world[2][3] + props.rl2
+                    new_matrix[2][3] = container_obj.matrix_world[2][3] + (props.rl2 * unit_scale)
         filling_obj.matrix_world = new_matrix
         bpy.context.view_layer.update()
 
diff --git a/src/blenderbim/blenderbim/bim/module/model/wall.py b/src/blenderbim/blenderbim/bim/module/model/wall.py
index 6cb50be29d..d7c71ad6a1 100644
--- a/src/blenderbim/blenderbim/bim/module/model/wall.py
+++ b/src/blenderbim/blenderbim/bim/module/model/wall.py
@@ -569,7 +569,7 @@ class DumbWallGenerator:
             matrix_world = Matrix.Rotation(self.rotation, 4, "Z")
             matrix_world.col[3] = self.location.to_4d()
             if self.collection_obj and self.collection_obj.BIMObjectProperties.ifc_definition_id:
-                matrix_world[2][3] = self.collection_obj.location[2] + props.rl1
+                matrix_world[2][3] = self.collection_obj.location[2] + (props.rl1 * self.unit_scale)
             obj.matrix_world = matrix_world
             bpy.context.view_layer.update()
             self.collection.objects.link(obj)