diff --git a/configure.py b/configure.py
index 7c5f48855..c610a4670 100644
--- a/configure.py
+++ b/configure.py
@@ -861,7 +861,7 @@ config.libs = [
     JSystemLib(
         "J3DGraphBase",
         [
-            Object(NonMatching, "JSystem/J3DGraphBase/J3DGD.cpp"),
+            Object(Matching,    "JSystem/J3DGraphBase/J3DGD.cpp"),
             Object(Matching,    "JSystem/J3DGraphBase/J3DSys.cpp"),
             Object(Matching,    "JSystem/J3DGraphBase/J3DVertex.cpp"),
             Object(NonMatching, "JSystem/J3DGraphBase/J3DTransform.cpp"),
diff --git a/src/JSystem/J3DGraphBase/J3DGD.cpp b/src/JSystem/J3DGraphBase/J3DGD.cpp
index 88efb9d96..985615134 100644
--- a/src/JSystem/J3DGraphBase/J3DGD.cpp
+++ b/src/JSystem/J3DGraphBase/J3DGD.cpp
@@ -134,9 +134,9 @@ void J3DGDSetVtxAttrFmtv(GXVtxFmt fmt, GXVtxAttrFmtList* vtxAttr, bool forceNBT)
                 nrmCompCnt = GX_NRM_NBT;
                 nbt3 = true;
             } else {
-                nrmCompCnt = GX_NRM_NBT;
-                if (!forceNBT)
-                    nrmCompCnt = vtxAttr->mCompCnt;
+                // possible fakematch? need to cast vtxAttr->mCompCnt to int to put value in r0 temporarily
+                // nrmCompCnt = forceNBT ? GX_NRM_NBT : vtxAttr->mCompCnt;
+                nrmCompCnt = (GXCompCnt)(forceNBT ? GX_NRM_NBT : (int)(vtxAttr->mCompCnt));
                 nbt3 = false;
             }
             break;