diff --git a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
index 3783e033..e648511c 100644
--- a/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/CircuitTrestleSetting.jsx
@@ -159,27 +159,26 @@ export default function CircuitTrestleSetting({ id }) {
   }
 
   const getRoofSurfaceList = () => {
-    return canvas
-      .getObjects()
-      .filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
-      .map((obj) => {
-        return {
-          roofSurfaceId: obj.id,
-          roofSurface: canvas
-            .getObjects()
-            .filter((o) => o.id === obj.parentId)[0]
-            .directionText.replace(/[0-9]/g, ''),
-          roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch,
-          moduleList: getModuleList(obj).map((module) => {
-            return {
-              itemId: module.moduleInfo.itemId,
-              circuit: module.circuitNumber ? module.circuitNumber : null,
-              pcsItemId: module.circuit ? module.circuit?.pcsItemId : null,
-              uniqueId: module.id ? module.id : null,
-            }
-          }),
-        }
-      })
+    const roofSurfaceList = canvas.getObjects().filter((obj) => obj.name === POLYGON_TYPE.MODULE_SETUP_SURFACE)
+    roofSurfaceList.sort((a, b) => a.left - b.left || b.top - a.top)
+    return roofSurfaceList.map((obj) => {
+      return {
+        roofSurfaceId: obj.id,
+        roofSurface: canvas
+          .getObjects()
+          .filter((o) => o.id === obj.parentId)[0]
+          .directionText.replace(/[0-9]/g, ''),
+        roofSurfaceIncl: canvas.getObjects().filter((o) => o.id === obj.parentId)[0].roofMaterial.pitch,
+        moduleList: getModuleList(obj).map((module) => {
+          return {
+            itemId: module.moduleInfo.itemId,
+            circuit: module.circuitNumber ? module.circuitNumber : null,
+            pcsItemId: module.circuit ? module.circuit?.pcsItemId : null,
+            uniqueId: module.id ? module.id : null,
+          }
+        }),
+      }
+    })
   }
 
   const getModuleList = (surface) => {
diff --git a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
index 32b15236..77404733 100644
--- a/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
+++ b/src/components/floor-plan/modal/circuitTrestle/step/type/PassivityCircuitAllocation.jsx
@@ -206,6 +206,9 @@ export default function PassivityCircuitAllocation(props) {
       .getObjects()
       .filter((obj) => targetModules.includes(obj.id))
       .forEach((obj) => {
+        if (obj.circuit) {
+          canvas.remove(obj.circuit)
+        }
         const moduleCircuitText = new fabric.Text(getCircuitNumber(), {
           left: obj.left + obj.width / 2,
           top: obj.top + obj.height / 2,