diff --git a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
index b67b819cd..918faa699 100644
--- a/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
+++ b/src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx
@@ -206,7 +206,7 @@ export function Characteristics() {
           )}
           {gun.type === 'autoReloader' ? (
             <>
-              <Info indent name="Most optimal">
+              <Info indent name="Most optimal shell index">
                 {stats.mostOptimalShellIndex}
               </Info>
               <Info name="Shell reloads" unit="s" />
diff --git a/src/core/blitzkit/tankCharacteristics.ts b/src/core/blitzkit/tankCharacteristics.ts
index 6180572e4..e2c9a14a3 100644
--- a/src/core/blitzkit/tankCharacteristics.ts
+++ b/src/core/blitzkit/tankCharacteristics.ts
@@ -343,11 +343,12 @@ export function tankCharacteristics(
           damageCoefficient * shell.damage.armor * gun.reload.slice(1).length
       : undefined;
   const shells = gun.type === 'regular' ? 1 : gun.count;
+  console.log(gun.reload);
   const mostOptimalShellIndex =
     gun.type === 'autoReloader'
-      ? gun.reload.at(-1)! < gun.reload.at(-2)!
-        ? gun.reload.length
-        : 1
+      ? gun.reload[0] + gun.intraClip < gun.reload[1]
+        ? 1
+        : gun.reload.length
       : undefined;
   const shellReloads =
     gun.type === 'autoReloader'