diff --git a/source/libublsettings-char.c b/source/libublsettings-char.c
index 1c20a48..bf87c91 100644
--- a/source/libublsettings-char.c
+++ b/source/libublsettings-char.c
@@ -695,11 +695,13 @@ char *yon_char_wrap_to_length_str(char *target, unsigned int length){
         config_str final = NULL;
         char *current = yon_char_new(target);
         for (;strlen(current)>length;){
-            int last = yon_char_find_last_symbol_before_length(target,' ',length);
+            int last = yon_char_find_last_symbol_before_length(current,' ',length);
             if (last>-1){
                 char *parsed = yon_char_divide(current,last);
                 yon_char_parsed_add_or_create_if_exists(final,&size,parsed);
                 free(parsed);
+            }else {
+                break;
             }
 
         }