diff --git a/src/TextOutput.java b/src/TextOutput.java
index 2a1ebe3..f302150 100644
--- a/src/TextOutput.java
+++ b/src/TextOutput.java
@@ -29,7 +29,7 @@ public class TextOutput {
                     int letterLenght = letters.length;
                     int lettersPrinted = 0;
                     do {
-                        System.out.println();
+                        //System.out.println();
                         currentLength = 0;
                         for (int i = 0; i < columnWidth; i++) {
                             if (letterLenght > 0) {
@@ -39,8 +39,11 @@ public class TextOutput {
                                 currentLength++;
                             }
                         }
+                        if(!(letterLenght == 0)){
+                            System.out.println();
+                        }
                     }
-                    while (letterLenght > columnWidth);
+                    while (letterLenght >= columnWidth);
 
                 }
                 else {
@@ -50,8 +53,9 @@ public class TextOutput {
                     }
                     System.out.print(word + " ");
                     currentLength += word.length() + 1;
-                    if(words.length == word
             }
+            }
+            System.out.println(); //added
         }
     }
 
diff --git a/test/TextOutputTest.java b/test/TextOutputTest.java
index e7f03aa..7be2eb4 100644
--- a/test/TextOutputTest.java
+++ b/test/TextOutputTest.java
@@ -17,9 +17,10 @@ class TextOutputTest {
         textOutput.formatFix(9);
         //textOutput.formatRaw();
         text = new ArrayList<>();
-        text.add("1234 12345");
+        text.add("123456789");
         text.add("1234");
         text.add("12 12 12");
+        text.add("1eeeeeee8597389751");
         text.add("TextTextTextTextTextTextTextTextTextTextTextTextTextText TextTextTextTextTextTextTextTextTextTextTextText TextTextText");
     }