diff --git a/source/ubl-utils.c b/source/ubl-utils.c
index 3906420..4dacefb 100644
--- a/source/ubl-utils.c
+++ b/source/ubl-utils.c
@@ -540,16 +540,15 @@ char *yon_char_divide(char *source, int dividepos)
  * Считает количество символов [find] в строке [source]
 */
 int yon_char_find_count(char *source, char *find){
-    char *working_string=yon_char_new(source);
-    int i=0;
+    char *working_string=source;
     int size=0;
-    int pos=0;
-    config_str rtn = yon_char_parse(working_string,&size,"\n");
-    for (int j=0;j<size;j++){
-        if(strstr(rtn[j],find))
-            i++;
+    while ((working_string = strstr(working_string, find))) {
+        if (working_string) {
+            working_string++;
+            size++;
+        }
     }
-    return i;
+    return size;
 }
 
 /**yon_char_divide_search(char *source, char *dividepos, int delete_divider)
@@ -583,7 +582,6 @@ char *yon_char_divide_search(char *source, char *dividepos, int delete_divider)
     }
     return source;
 }
-
 /**yon_char_from_int(int int_to_convert)
  * [EN]
  * char *yon_char_from_int(int int_to_convert)
@@ -640,15 +638,18 @@ char *yon_char_replace(char *source, char *find, char*replace){
 */
 char **yon_char_parse(char *parameters, int *size, char *divider){
     char **string=NULL;
+    if (!strstr(parameters, divider)) {
+        return NULL;
+    }
     int i=1;
     string=malloc(sizeof(char*));
     char *paramline=yon_char_new(parameters);
     char *param;
     while ((param=yon_char_divide_search(paramline,divider,1))){
+        if (strcmp(param,paramline)==0) break;
         string=realloc(string,sizeof(char*)*i);
         string[i-1]=yon_char_new(param);
         i++;
-        if (strcmp(param,paramline)==0) break;
     }
     string=realloc(string,sizeof(char*)*i);
         string[i-1]=yon_char_new(paramline);