diff --git a/Start_Windows/game.c b/Start_Windows/game.c
index 0f12dce..4c46e24 100644
--- a/Start_Windows/game.c
+++ b/Start_Windows/game.c
@@ -34,17 +34,21 @@ int createWordSalad(char salad[MAX_SEARCH_FIELD_LEN][MAX_SEARCH_FIELD_LEN], unsi
         int wordlength = 0;
         do
         {
-            while(words[i][wordlength] != '0')//gets the length of the current word
+            while((words[i][wordlength] != '\0')&&(wordlength != MAX_WORD_LEN))//gets the length of the current word
+            {
                 wordlength++;
-            int startPosition1 = RANDOMNUMBER(0, MAX_SEARCH_FIELD_LEN - wordlength);//gets a random starting position for the word
-            int startPosition2 = RANDOMNUMBER(0, MAX_SEARCH_FIELD_LEN);//gest a second coordinate for the starting position
+            }
+            int startPosition1 = RANDOMNUMBER(0, searchFieldLen - wordlength);//gets a random starting position for the word
+            int startPosition2 = RANDOMNUMBER(0, searchFieldLen);//gest a second coordinate for the starting position
             if(RANDOMNUMBER(0,1) < 1)//Flips a coin whether the number is vertical or horizontal
             {//Horizontal
                 int allClear = 0;
                 for(int j = 0; j < wordlength; j++)//Checks, if there already is a word, where the new word should be placed.
                 {
                     if(salad[startPosition1 + j][startPosition2] != 63)
+                    {
                         allClear++;
+                    }
                 }
                 if(allClear == 0)//Places the word
                 {