diff --git a/src/gcode/mod.rs b/src/gcode/mod.rs
index aee17bd..a3af5ab 100644
--- a/src/gcode/mod.rs
+++ b/src/gcode/mod.rs
@@ -94,8 +94,11 @@ pub fn program2gcode<W: Write>(program: Vec<Command>, mut w: W) -> io::Result<()
         let mut it = words.iter();
         if let Some(command_word) = it.next() {
             write!(w, "{}{}", command_word.letter, command_word.value)?;
-            for word in it {
-                write!(w, " {}{} ", word.letter, word.value)?;
+            for (i, word) in it.enumerate() {
+                write!(w, " {}{}", word.letter, word.value)?;
+                if i != words.len() - 2 {
+                    write!(w, " ");
+                }
             }
             writeln!(w, "")?;
         }
diff --git a/tests/square.gcode b/tests/square.gcode
index e69de29..a6ff7d9 100644
--- a/tests/square.gcode
+++ b/tests/square.gcode
@@ -0,0 +1,12 @@
+G21
+G94
+G90
+G0 X0  Y0
+;svg#svg8 > g#layer1 > path#path838
+G0 X1  Y9
+G1 X9  Y9  F300
+G1 X9  Y1  F300
+G1 X1  Y1  F300
+G1 X1  Y9  F300
+G0 X0  Y0
+M20