diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index 689acc51..c27b5795 100644
Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ
diff --git a/Switch_FileFormatsMain/FileFormats/BCRES/Wrappers/CMDL/CMDLWrapper.cs b/Switch_FileFormatsMain/FileFormats/BCRES/Wrappers/CMDL/CMDLWrapper.cs
index 910d851d..c4c8dbe6 100644
--- a/Switch_FileFormatsMain/FileFormats/BCRES/Wrappers/CMDL/CMDLWrapper.cs
+++ b/Switch_FileFormatsMain/FileFormats/BCRES/Wrappers/CMDL/CMDLWrapper.cs
@@ -68,16 +68,17 @@ namespace FirstPlugin
                 var matWrapper = new MTOBWrapper() { BcresParent = bcres };
                 matWrapper.Load(material);
                 if (matWrapper.Text == string.Empty)
-                    matWrapper.Text = $"Material {Index}";
+                    matWrapper.Text = $"Material {Index++}";
                 MaterialFolder.Nodes.Add(matWrapper);
             }
 
+            Index = 0;
             foreach (var mesh in model.Meshes)
             {
                 var meshWrapper = new SOBJWrapper(this, mesh) { BcresParent = bcres };
                 MeshFolder.Nodes.Add(meshWrapper);
-                if (MeshFolder.Text == string.Empty)
-                    MeshFolder.Text = $"Mesh {Index}";
+                if (meshWrapper.Text == string.Empty)
+                    meshWrapper.Text = $"Mesh {Index++}";
                 Shapes.Add(meshWrapper);
             }
         }
diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
index 263b550c..f24bf8b4 100644
Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ