diff --git a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/OatFile.java b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/OatFile.java
index 4e19e4e2..aaf942ea 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/OatFile.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/OatFile.java
@@ -588,6 +588,14 @@ public class OatFile extends BaseDexBuffer implements MultiDexContainer<OatDexFi
             int dexOffset = readSmallUint(offset);
             offset += 4;
 
+            byte[] buf;
+            if (getOatVersion() >= 87 && vdexProvider != null && vdexProvider.getVdex() != null) {
+                buf = vdexProvider.getVdex();
+            } else {
+                buf = OatFile.this.buf;
+                dexOffset += oatHeader.headerOffset;
+            }
+
             if (getOatVersion() >= 75) {
                 offset += 4; // offset to class offsets table
             }
@@ -602,14 +610,6 @@ public class OatFile extends BaseDexBuffer implements MultiDexContainer<OatDexFi
 
             index++;
 
-            byte[] buf;
-            if (getOatVersion() >= 87 && vdexProvider != null && vdexProvider.getVdex() != null) {
-                buf = vdexProvider.getVdex();
-            } else {
-                buf = OatFile.this.buf;
-                offset += oatHeader.headerOffset;
-            }
-
             return new DexEntry(filename, buf, dexOffset);
         }