diff --git a/src/controllers/03-customer-controller.ts b/src/controllers/03-customer-controller.ts
index b33d87b..367cd91 100644
--- a/src/controllers/03-customer-controller.ts
+++ b/src/controllers/03-customer-controller.ts
@@ -51,24 +51,21 @@ export type CustomerCreate = {
   status?: Status;
   selectedImage?: string;
 
-  branch: ((
-    | {
-        // NOTE: About (Natural Person)
-        citizenId: string;
-      }
-    | {
-        // NOTE: About (Legal Entity)
-        legalPersonNo: string;
-        registerName: string;
-        registerNameEN: string;
-        registerDate: Date;
-        authorizedCapital: string;
-        authorizedName: string;
-        authorizedNameEN: string;
-      }
-  ) & {
-    customerId: string;
-    customerName: string;
+  branch: {
+    // NOTE: About (Natural Person)
+    citizenId: string;
+
+    // NOTE: About (Legal Entity)
+    legalPersonNo?: string;
+    registerName?: string;
+    registerNameEN?: string;
+    registerDate?: Date;
+    authorizedCapital?: string;
+    authorizedName?: string;
+    authorizedNameEN?: string;
+    customerName?: string;
+
+    customerId?: string;
 
     telephoneNo: string;
 
@@ -103,7 +100,7 @@ export type CustomerCreate = {
     subDistrictId?: string | null;
     districtId?: string | null;
     provinceId?: string | null;
-  })[];
+  }[];
 };
 
 export type CustomerUpdate = {
@@ -267,7 +264,7 @@ export class CustomerController extends Controller {
           );
         }
 
-        const runningKey = `CUSTOMER_BRANCH_${company}_${"citizenId" in headoffice ? headoffice.citizenId : headoffice.legalPersonNo}`;
+        const runningKey = `CUSTOMER_BRANCH_${company}_${headoffice.citizenId || headoffice.legalPersonNo}`;
 
         const last = await tx.runningNo.upsert({
           where: { key: runningKey },