diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index d51fbde6..08d0ce2b 100644
Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ
diff --git a/Switch_FileFormatsMain/FileFormats/BMD/BMD.cs b/Switch_FileFormatsMain/FileFormats/BMD/BMD.cs
index fa9b82b9..de7c371c 100644
--- a/Switch_FileFormatsMain/FileFormats/BMD/BMD.cs
+++ b/Switch_FileFormatsMain/FileFormats/BMD/BMD.cs
@@ -149,7 +149,7 @@ namespace FirstPlugin
 
             for (int i = 0; i < BMDFile.Shapes.Shapes.Count; i++)
             {
-                var curShape = BMDFile.Shapes.Shapes[BMDFile.Shapes.RemapTable[i]];
+                var curShape = BMDFile.Shapes.Shapes[i];
 
                 var mat = new BMDMaterialWrapper(BMDFile.Materials.GetMaterial(i), BMDFile);
                 MaterialFolder.Nodes.Add(mat);
diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
index fee8cfa3..3bf2d6d4 100644
Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ
diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache
index d212747d..31443025 100644
Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csprojAssemblyReference.cache differ
diff --git a/Toolbox/Lib/SuperBMDLib.dll b/Toolbox/Lib/SuperBMDLib.dll
index 4c12d68e..e2edb229 100644
Binary files a/Toolbox/Lib/SuperBMDLib.dll and b/Toolbox/Lib/SuperBMDLib.dll differ
diff --git a/Toolbox/Lib/SuperBMDLib.pdb b/Toolbox/Lib/SuperBMDLib.pdb
index 1bc894e3..169fbd3b 100644
Binary files a/Toolbox/Lib/SuperBMDLib.pdb and b/Toolbox/Lib/SuperBMDLib.pdb differ