diff --git a/CHANGELIST.md b/CHANGELIST.md
index 4a8d9807..dd5aa4e5 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -70,6 +70,7 @@
 - Always omit EA CD-Key
 - Add packer filtering tests
 - Simplify prefix filtering
+- Fix issue with odd quoting
 
 ### 3.2.4 (2024-11-24)
 
diff --git a/MPF.ExecutionContexts.Test/RedumperTests.cs b/MPF.ExecutionContexts.Test/RedumperTests.cs
index 32e33751..ea887662 100644
--- a/MPF.ExecutionContexts.Test/RedumperTests.cs
+++ b/MPF.ExecutionContexts.Test/RedumperTests.cs
@@ -80,6 +80,17 @@ namespace MPF.ExecutionContexts.Test
             Assert.True(context.IsDumpingCommand());
         }
 
+        [Theory]
+        [InlineData("cd --drive=dr --image-path=\"directory name\" --image-name=\"image name.bin\"")]
+        public void SpacesTest(string parameters)
+        {
+            string? expected = "cd --drive=dr --image-path=\"directory name\" --image-name=\"image name.bin\"";
+            var context = new ExecutionContext(parameters);
+            string? actual = context.GenerateParameters();
+            Assert.Equal(expected, actual);
+            Assert.True(context.IsDumpingCommand());
+        }
+
         #endregion
 
         #region DVD
diff --git a/MPF.ExecutionContexts/Data/StringInput.cs b/MPF.ExecutionContexts/Data/StringInput.cs
index 16844c03..344d806d 100644
--- a/MPF.ExecutionContexts/Data/StringInput.cs
+++ b/MPF.ExecutionContexts/Data/StringInput.cs
@@ -97,7 +97,7 @@ namespace MPF.ExecutionContexts.Data
                 }
 
                 index++;
-                Value = parts[index];
+                Value = parts[index].Trim('"');
                 return true;
             }
 
@@ -116,7 +116,7 @@ namespace MPF.ExecutionContexts.Data
                     return !_required;
                 }
 
-                Value = val;
+                Value = val.Trim('"');
                 return true;
             }