diff --git a/Penumbra/Mods/Manager/ModOptionEditor.cs b/Penumbra/Mods/Manager/ModOptionEditor.cs
index 07c6f38e..9d942574 100644
--- a/Penumbra/Mods/Manager/ModOptionEditor.cs
+++ b/Penumbra/Mods/Manager/ModOptionEditor.cs
@@ -158,10 +158,10 @@ public class ModOptionEditor(CommunicatorService communicator, SaveService saveS
     {
         var group  = mod.Groups[groupIdx];
         var option = group[optionIdx];
-        if (option.Description == newDescription || option is not SubMod s)
+        if (option.Description == newDescription)
             return;
 
-        s.Description = newDescription;
+        option.Description = newDescription;
         saveService.QueueSave(new ModSaveGroup(mod, groupIdx, config.ReplaceNonAsciiOnImport));
         communicator.ModOptionChanged.Invoke(ModOptionChangeType.DisplayChange, mod, groupIdx, optionIdx, -1);
     }
diff --git a/Penumbra/Mods/Subclasses/IModGroup.cs b/Penumbra/Mods/Subclasses/IModGroup.cs
index 7554f6dc..38f070b3 100644
--- a/Penumbra/Mods/Subclasses/IModGroup.cs
+++ b/Penumbra/Mods/Subclasses/IModGroup.cs
@@ -72,8 +72,9 @@ public readonly struct ModSaveGroup : ISavable
 
     public void Save(StreamWriter writer)
     {
-        using var j          = new JsonTextWriter(writer) { Formatting = Formatting.Indented };
-        var       serializer = new JsonSerializer { Formatting         = Formatting.Indented };
+        using var j = new JsonTextWriter(writer);
+        j.Formatting = Formatting.Indented;
+        var serializer = new JsonSerializer { Formatting = Formatting.Indented };
         if (_groupIdx >= 0)
         {
             j.WriteStartObject();
@@ -87,19 +88,25 @@ public readonly struct ModSaveGroup : ISavable
             j.WriteValue(_group.Type.ToString());
             j.WritePropertyName(nameof(_group.DefaultSettings));
             j.WriteValue(_group.DefaultSettings.Value);
-            j.WritePropertyName("Options");
-            j.WriteStartArray();
-            for (var idx = 0; idx < _group.Count; ++idx)
+            switch (_group)
             {
-                SubMod.WriteSubMod(j, serializer, _group[idx], _basePath, _group.Type switch
-                {
-                    GroupType.Multi => _group.OptionPriority(idx),
-                    _               => null,
-                });
+                case SingleModGroup single:
+                    j.WritePropertyName("Options");
+                    j.WriteStartArray();
+                    foreach (var option in single.OptionData)
+                        SubMod.WriteSubMod(j, serializer, option, _basePath, null);
+                    j.WriteEndArray();
+                    j.WriteEndObject();
+                    break;
+                case MultiModGroup multi:
+                    j.WritePropertyName("Options");
+                    j.WriteStartArray();
+                    foreach (var (option, priority) in multi.PrioritizedOptions)
+                        SubMod.WriteSubMod(j, serializer, option, _basePath, priority);
+                    j.WriteEndArray();
+                    j.WriteEndObject();
+                    break;
             }
-
-            j.WriteEndArray();
-            j.WriteEndObject();
         }
         else
         {