diff --git a/include/d/actor/d_a_bwdg.h b/include/d/actor/d_a_bwdg.h
index dcd4790dc..3897797e5 100644
--- a/include/d/actor/d_a_bwdg.h
+++ b/include/d/actor/d_a_bwdg.h
@@ -16,8 +16,8 @@ public:
 
     MtxP getMtx() { return mMtx; }
     void setTevStr(dKy_tevstr_c* tevstr) { mpTevStr = tevstr; }
-    cXyz* getPos() { return &mPos[m00010 * 0x1081]; }
-    cXyz* getNrm() { return &mNrm[m00010 * 0x1081]; }
+    cXyz* getPos() { return mPos[m00010]; }
+    cXyz* getNrm() { return mNrm[m00010]; }
 
     void draw();
 
@@ -25,8 +25,8 @@ public:
     /* 0x00010 */ u8 m00010;
     /* 0x00014 */ Mtx mMtx;
     /* 0x00044 */ dKy_tevstr_c* mpTevStr;
-    /* 0x00048 */ cXyz mPos[0x1081 * 2];
-    /* 0x18C60 */ cXyz mNrm[0x1081 * 2];
+    /* 0x00048 */ cXyz mPos[2][0x1081];
+    /* 0x18C60 */ cXyz mNrm[2][0x1081];
 };  // Size: 0x31878
 
 class bwdg_class : public fopAc_ac_c {
diff --git a/src/d/actor/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp
index e36d95378..b18de676a 100644
--- a/src/d/actor/d_a_bwdg.cpp
+++ b/src/d/actor/d_a_bwdg.cpp
@@ -46,8 +46,8 @@ void daBwdg_packet_c::draw() {
     dKy_setLight_mine(mpTevStr);
     GFSetVtxDescv(l_vtxDescList);
     GFSetVtxAttrFmtv(GX_VTXFMT0, l_vtxAttrFmtList);
-    GFSetArray(GX_VA_POS, &mPos[m00010 * 0x1081], sizeof(cXyz));
-    GFSetArray(GX_VA_NRM, &mNrm[m00010 * 0x1081], sizeof(cXyz));
+    GFSetArray(GX_VA_POS, mPos[m00010], sizeof(cXyz));
+    GFSetArray(GX_VA_NRM, mNrm[m00010], sizeof(cXyz));
     GFSetArray(GX_VA_TEX0, l_texCoord, sizeof(cXy));
     GFSetTevColorS10(GX_TEVREG0, mpTevStr->mColorC0);
     GFSetTevColor(GX_TEVREG1, mpTevStr->mColorK0);