diff --git a/configure.py b/configure.py
index d34159048..a5da38af6 100644
--- a/configure.py
+++ b/configure.py
@@ -853,7 +853,7 @@ config.libs = [
             Object(NonMatching, "JSystem/J3DGraphBase/J3DTransform.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DPacket.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DShapeMtx.cpp"),
-            Object(NonMatching, "JSystem/J3DGraphBase/J3DShape.cpp"),
+            Object(Matching,    "JSystem/J3DGraphBase/J3DShape.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DMaterial.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DMatBlock.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DTevs.cpp"),
diff --git a/src/JSystem/J3DGraphBase/J3DShape.cpp b/src/JSystem/J3DGraphBase/J3DShape.cpp
index 1dcd464de..966890774 100644
--- a/src/JSystem/J3DGraphBase/J3DShape.cpp
+++ b/src/JSystem/J3DGraphBase/J3DShape.cpp
@@ -152,7 +152,9 @@ void J3DShape::makeVtxArrayCmd() {
             mHasNBT = true;
             stride[GX_VA_NRM - GX_VA_POS] *= 3;
             array[GX_VA_NRM - GX_VA_POS] = mVertexData->getVtxNBTArray();
-        } else if (vtxDesc->attr == GX_VA_PNMTXIDX && vtxDesc->type != GX_NONE) {
+        }
+
+        if (vtxDesc->attr == GX_VA_PNMTXIDX && vtxDesc->type != GX_NONE) {
             mHasPNMTXIdx = true;
         }
     }