diff --git a/src/hooks/useColumns/index.tsx b/src/hooks/useColumns/index.tsx
index 99490db32..fcc007ab0 100644
--- a/src/hooks/useColumns/index.tsx
+++ b/src/hooks/useColumns/index.tsx
@@ -176,9 +176,13 @@ function useColumns<RecordType>(
       // >>> Insert expand column if not exist
       if (!cloneColumns.includes(EXPAND_COLUMN)) {
         const expandColIndex = expandIconColumnIndex || 0;
-        if (expandColIndex >= 0) {
+        console.log(expandColIndex);
+        if (expandColIndex >= 0 && (expandColIndex || fixed === 'left' || !fixed)) {
           cloneColumns.splice(expandColIndex, 0, EXPAND_COLUMN);
         }
+        if (fixed === 'right') {
+          cloneColumns.splice(baseColumns.length, 0, EXPAND_COLUMN);
+        }
       }
 
       // >>> Deduplicate additional expand column
@@ -197,10 +201,8 @@ function useColumns<RecordType>(
       const prevColumn = baseColumns[expandColumnIndex];
 
       let fixedColumn: FixedType | null;
-      if ((fixed === 'left' || fixed) && !expandIconColumnIndex) {
-        fixedColumn = 'left';
-      } else if ((fixed === 'right' || fixed) && expandIconColumnIndex === baseColumns.length) {
-        fixedColumn = 'right';
+      if (fixed) {
+        fixedColumn = fixed;
       } else {
         fixedColumn = prevColumn ? prevColumn.fixed : null;
       }
diff --git a/tests/__snapshots__/ExpandRow.spec.jsx.snap b/tests/__snapshots__/ExpandRow.spec.jsx.snap
index 72dfbbe21..f10c8e2b3 100644
--- a/tests/__snapshots__/ExpandRow.spec.jsx.snap
+++ b/tests/__snapshots__/ExpandRow.spec.jsx.snap
@@ -138,7 +138,7 @@ LoadedCheerio {
 exports[`Table.Expand > does not crash if scroll is not set 1`] = `
 LoadedCheerio {
   "0": <div
-    class="rc-table rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-left"
+    class="rc-table rc-table-scroll-horizontal"
   >
     <div
       class="rc-table-container"
@@ -148,21 +148,13 @@ LoadedCheerio {
         style="overflow-x: auto; overflow-y: hidden;"
       >
         <table
-          style="min-width: 100%; table-layout: fixed;"
+          style="min-width: 100%; table-layout: auto;"
         >
-          <colgroup>
-            <col
-              class="rc-table-expand-icon-col"
-            />
-          </colgroup>
+          <colgroup />
           <thead
             class="rc-table-thead"
           >
             <tr>
-              <th
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-                style="position: sticky; left: 0px;"
-              />
               <th
                 class="rc-table-cell"
                 scope="col"
@@ -218,28 +210,11 @@ LoadedCheerio {
                    
                 </div>
               </td>
-              <td
-                style="padding: 0px; border: 0px; height: 0px;"
-              >
-                <div
-                  style="height: 0px; overflow: hidden;"
-                >
-                   
-                </div>
-              </td>
             </tr>
             <tr
               class="rc-table-row rc-table-row-level-0"
               data-row-key="0"
             >
-              <td
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-                style="position: sticky; left: 0px;"
-              >
-                <span
-                  class="rc-table-row-expand-icon rc-table-row-collapsed"
-                />
-              </td>
               <td
                 class="rc-table-cell"
               >
@@ -260,14 +235,6 @@ LoadedCheerio {
               class="rc-table-row rc-table-row-level-0"
               data-row-key="1"
             >
-              <td
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-                style="position: sticky; left: 0px;"
-              >
-                <span
-                  class="rc-table-row-expand-icon rc-table-row-collapsed"
-                />
-              </td>
               <td
                 class="rc-table-cell"
               >
@@ -323,7 +290,7 @@ LoadedCheerio {
 exports[`Table.Expand > does not crash if scroll is not set 2`] = `
 LoadedCheerio {
   "0": <div
-    class="rc-table rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-left"
+    class="rc-table rc-table-scroll-horizontal"
   >
     <div
       class="rc-table-container"
@@ -333,21 +300,13 @@ LoadedCheerio {
         style="overflow-x: auto; overflow-y: hidden;"
       >
         <table
-          style="min-width: 100%; table-layout: fixed;"
+          style="min-width: 100%; table-layout: auto;"
         >
-          <colgroup>
-            <col
-              class="rc-table-expand-icon-col"
-            />
-          </colgroup>
+          <colgroup />
           <thead
             class="rc-table-thead"
           >
             <tr>
-              <th
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-                style="position: sticky; left: 0px;"
-              />
               <th
                 class="rc-table-cell"
                 scope="col"
@@ -403,28 +362,11 @@ LoadedCheerio {
                    
                 </div>
               </td>
-              <td
-                style="padding: 0px; border: 0px; height: 0px;"
-              >
-                <div
-                  style="height: 0px; overflow: hidden;"
-                >
-                   
-                </div>
-              </td>
             </tr>
             <tr
               class="rc-table-row rc-table-row-level-0"
               data-row-key="0"
             >
-              <td
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-                style="position: sticky; left: 0px;"
-              >
-                <span
-                  class="rc-table-row-expand-icon rc-table-row-collapsed"
-                />
-              </td>
               <td
                 class="rc-table-cell"
               >
@@ -445,14 +387,6 @@ LoadedCheerio {
               class="rc-table-row rc-table-row-level-0"
               data-row-key="1"
             >
-              <td
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-                style="position: sticky; left: 0px;"
-              >
-                <span
-                  class="rc-table-row-expand-icon rc-table-row-collapsed"
-                />
-              </td>
               <td
                 class="rc-table-cell"
               >
@@ -1183,7 +1117,7 @@ LoadedCheerio {
 exports[`Table.Expand > work in expandable fix 1`] = `
 LoadedCheerio {
   "0": <div
-    class="rc-table rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-left"
+    class="rc-table rc-table-scroll-horizontal"
   >
     <div
       class="rc-table-container"
@@ -1193,21 +1127,13 @@ LoadedCheerio {
         style="overflow-x: auto; overflow-y: hidden;"
       >
         <table
-          style="width: 903px; min-width: 100%; table-layout: fixed;"
+          style="width: 903px; min-width: 100%; table-layout: auto;"
         >
-          <colgroup>
-            <col
-              class="rc-table-expand-icon-col"
-            />
-          </colgroup>
+          <colgroup />
           <thead
             class="rc-table-thead"
           >
             <tr>
-              <th
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-                style="position: sticky; left: 0px;"
-              />
               <th
                 class="rc-table-cell"
                 scope="col"
@@ -1263,28 +1189,11 @@ LoadedCheerio {
                    
                 </div>
               </td>
-              <td
-                style="padding: 0px; border: 0px; height: 0px;"
-              >
-                <div
-                  style="height: 0px; overflow: hidden;"
-                >
-                   
-                </div>
-              </td>
             </tr>
             <tr
               class="rc-table-row rc-table-row-level-0"
               data-row-key="0"
             >
-              <td
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-                style="position: sticky; left: 0px;"
-              >
-                <span
-                  class="rc-table-row-expand-icon rc-table-row-collapsed"
-                />
-              </td>
               <td
                 class="rc-table-cell"
               >
@@ -1305,14 +1214,6 @@ LoadedCheerio {
               class="rc-table-row rc-table-row-level-0"
               data-row-key="1"
             >
-              <td
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
-                style="position: sticky; left: 0px;"
-              >
-                <span
-                  class="rc-table-row-expand-icon rc-table-row-collapsed"
-                />
-              </td>
               <td
                 class="rc-table-cell"
               >
@@ -1368,7 +1269,7 @@ LoadedCheerio {
 exports[`Table.Expand > work in expandable fix 2`] = `
 LoadedCheerio {
   "0": <div
-    class="rc-table rc-table-fixed-column rc-table-scroll-horizontal rc-table-has-fix-right"
+    class="rc-table rc-table-fixed-column rc-table-fixed-column-gapped rc-table-scroll-horizontal"
   >
     <div
       class="rc-table-container"
@@ -1411,8 +1312,8 @@ LoadedCheerio {
                 Gender
               </th>
               <th
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-right rc-table-cell-fix-right-first"
-                style="position: sticky; right: 0px;"
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
               />
             </tr>
           </thead>
@@ -1481,8 +1382,8 @@ LoadedCheerio {
                 F
               </td>
               <td
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-right rc-table-cell-fix-right-first"
-                style="position: sticky; right: 0px;"
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
               >
                 <span
                   class="rc-table-row-expand-icon rc-table-row-collapsed"
@@ -1509,8 +1410,8 @@ LoadedCheerio {
                 M
               </td>
               <td
-                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-right rc-table-cell-fix-right-first"
-                style="position: sticky; right: 0px;"
+                class="rc-table-cell rc-table-row-expand-icon-cell rc-table-cell-fix-left rc-table-cell-fix-left-last"
+                style="position: sticky; left: 0px;"
               >
                 <span
                   class="rc-table-row-expand-icon rc-table-row-collapsed"