diff --git a/SabreTools.Help/Feature.cs b/SabreTools.Help/Feature.cs
index 45d113b4..1eaa7d23 100644
--- a/SabreTools.Help/Feature.cs
+++ b/SabreTools.Help/Feature.cs
@@ -467,7 +467,7 @@ namespace SabreTools.Help
                     if (valid)
                     {
                         _value ??= new List<string>();
-                        (_value as List<string>)?.Add(input.Split('=')[1]);
+                        (_value as List<string>)?.Add(string.Join("=", input.Split('=').Skip(1)));
                     }
 
                     break;
@@ -476,7 +476,7 @@ namespace SabreTools.Help
                     valid = input.Contains('=') && Flags.Contains(input.Split('=')[0]);
                     if (valid)
                     {
-                        _value = input.Split('=')[1];
+                        _value = string.Join("=", input.Split('=').Skip(1));
 
                         // If we've already found this feature before
                         if (_foundOnce && !ignore)