diff --git a/Runtime/Graphics/CModelBoo.cpp b/Runtime/Graphics/CModelBoo.cpp
index e9b0a1544..a82b591cf 100644
--- a/Runtime/Graphics/CModelBoo.cpp
+++ b/Runtime/Graphics/CModelBoo.cpp
@@ -285,7 +285,6 @@ CBooModel::ModelInstance* CBooModel::PushNewModelInstance()
                 TCachedToken<CTexture>& tex = x1c_textures[idx];
                 texs[texCount++] = tex.GetObj()->GetBooTexture();
             }
-            texs[6] = g_Renderer->x14c_reflectionTex;
             texs[7] = g_Renderer->x220_sphereRamp;
 
             if (m_skinBankCount)
@@ -308,6 +307,7 @@ CBooModel::ModelInstance* CBooModel::PushNewModelInstance()
             bool useReflection = mat.flags.samusReflection() || mat.flags.samusReflectionSurfaceEye();
             if (useReflection)
             {
+                texs[texCount] = g_Renderer->x14c_reflectionTex;
                 thisOffs[3] = curReflect;
                 curReflect += 256;
             }
@@ -340,7 +340,7 @@ CBooModel::ModelInstance* CBooModel::PushNewModelInstance()
                 }
                 else if (useReflection)
                 {
-                    texCount = 7;
+                    texCount = mat.textureIdxs.size() + 1;
                     ltexs = texs;
                 }
                 else
diff --git a/hecl b/hecl
index e88c5a689..8fb54452d 160000
--- a/hecl
+++ b/hecl
@@ -1 +1 @@
-Subproject commit e88c5a6891c2b68d8933df863022d3f5f3074bc2
+Subproject commit 8fb54452d2b5edecb3b98f0fb0e07ed4c860cd02