diff --git a/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Generator.java b/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Generator.java
index d3b4f2c..4bf4096 100644
--- a/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Generator.java
+++ b/datastructures-csv/src/main/java/org/xbib/datastructures/csv/Generator.java
@@ -59,19 +59,18 @@ public class Generator implements Constants, Closeable, Flushable {
     }
 
     public synchronized void write(String value) throws IOException {
-        if (col >= keys.size()) {
-            writer.write(LF);
-            row++;
-            col = 0;
-        } else {
-            if (col > 0) {
-                writer.write(separator);
-            }
+        if (col > 0) {
+            writer.write(separator);
         }
         if (value != null) {
             writer.write(escape(value));
         }
         col++;
+        if (col >= keys.size()) {
+            writer.write(LF);
+            row++;
+            col = 0;
+        }
     }
 
     public int getColumn() {
diff --git a/datastructures-csv/src/test/java/org/xbib/datastructures/csv/test/GeneratorTest.java b/datastructures-csv/src/test/java/org/xbib/datastructures/csv/test/GeneratorTest.java
index 948c655..9693be5 100644
--- a/datastructures-csv/src/test/java/org/xbib/datastructures/csv/test/GeneratorTest.java
+++ b/datastructures-csv/src/test/java/org/xbib/datastructures/csv/test/GeneratorTest.java
@@ -18,7 +18,7 @@ public class GeneratorTest {
             gen.write("val" + i);
         }
         gen.close();
-        assertEquals("val0\nval1", writer.toString());
+        assertEquals("val0\nval1\n", writer.toString());
     }
 
     @Test
@@ -31,7 +31,7 @@ public class GeneratorTest {
             gen.write("val" + i);
         }
         gen.close();
-        assertEquals("val0,val0\nval1,val1", writer.toString());
+        assertEquals("val0,val0\nval1,val1\n", writer.toString());
     }
 
     @Test
@@ -45,7 +45,7 @@ public class GeneratorTest {
             gen.write("hey look a line seperator \n");
         }
         gen.close();
-        assertEquals("val0,\"\"\"Hello, World\"\"\",\"hey look a line seperator \n\"", writer.toString());
+        assertEquals("val0,\"\"\"Hello, World\"\"\",\"hey look a line seperator \n\"\n", writer.toString());
     }
 
     @Test
@@ -59,7 +59,7 @@ public class GeneratorTest {
             gen.write("hey look a line seperator \n");
         }
         gen.close();
-        assertEquals("\"val0\";\"\"\"Hello, World\"\"\";\"hey look a line seperator \n\"", writer.toString());
+        assertEquals("\"val0\";\"\"\"Hello, World\"\"\";\"hey look a line seperator \n\"\n", writer.toString());
     }
 }