diff --git a/Svg2Gcode/Svg/Paths/PathShapeParser.cs b/Svg2Gcode/Svg/Paths/PathShapeParser.cs
index f4e59f6..5307e1f 100644
--- a/Svg2Gcode/Svg/Paths/PathShapeParser.cs
+++ b/Svg2Gcode/Svg/Paths/PathShapeParser.cs
@@ -39,6 +39,10 @@ private IEnumerable<PathCommand> parse(string data)
                 skipWhiteSpace = false;
                 if (char.IsLetter(commandKey) && commandKey != 'e') // new command
                 {
+                    var arg = builder.ToString();
+                    if (!string.IsNullOrEmpty(arg))
+                        arguments.Add(arg);
+
                     if (i > 0) // process the previous command
                     {
                         ICommandParser parser = getParser(previousCommandKey);
@@ -47,6 +51,7 @@ private IEnumerable<PathCommand> parse(string data)
 
                     previousCommandKey = commandKey;
                     arguments.Clear();
+                    builder.Clear();
                     skipWhiteSpace = true;
                 }
                 else if (commandKey == ' ' || commandKey == ',')