diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo
index 3484e929..5489f88d 100644
Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ
diff --git a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FMAT.cs b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FMAT.cs
index 32df483f..cf943195 100644
--- a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FMAT.cs	
+++ b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMDL/FMAT.cs	
@@ -161,8 +161,8 @@ namespace Bfres.Structs
             //Adjust all the indices properly based on this current index
             foreach (var shape in model.shapes)
             {
-                //If there are indices higher than this index, shift them
-                if (shape.MaterialIndex > CurrentIndex)
+                //If there are indices higher or equal than this index, shift them
+                if (shape.MaterialIndex >= CurrentIndex && shape.MaterialIndex != 0)
                 {
                     shape.MaterialIndex -= 1;
                 }
diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache
index 44356a57..32bd26c6 100644
Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ