diff --git a/source/libublsettingsui-gtk3-save.c b/source/libublsettingsui-gtk3-save.c
index 41cbc8c..cd3d35f 100644
--- a/source/libublsettingsui-gtk3-save.c
+++ b/source/libublsettingsui-gtk3-save.c
@@ -418,7 +418,7 @@ void yon_save_window_loaded_config_init(template_saving_window *window, struct l
                         if (strstr(old_val,"&")) {old_val = yon_char_replace(old_val,"&","\003");old_val = yon_char_replace(old_val,"\003","&");}
                         if (strstr(old_val,">")) old_val = yon_char_replace(old_val,">","<");
                         if (strstr(old_val,"<")) old_val = yon_char_replace(old_val,"<","&gt;");
-                        if (strstr(new_val,"&")) {new_val = yon_char_replace(new_val,"&","\003");new_val = yon_char_replace(new_val,"\003","&amp;");}
+                        if (strstr(new_val,"&")) {int sz = 0; config_str new_val_parsed = yon_char_parse(new_val,&sz,"&");new_val = yon_char_parsed_to_string(new_val_parsed,sz,"&amp;"); yon_char_parsed_free(new_val_parsed,sz);}
                         if (strstr(new_val,">")) new_val = yon_char_replace(new_val,">","&lt;");
                         if (strstr(new_val,"<")) new_val = yon_char_replace(new_val,"<","&gt;");
                         char *compare_string = yon_char_unite("<s>",(char*)new_val,"</s>\n",(char*)old_val,NULL);
@@ -431,7 +431,7 @@ void yon_save_window_loaded_config_init(template_saving_window *window, struct l
                     if (status==0||status==-2) status = 0;
                     else status=1;
                         char *old_val = yon_char_new(current->data);
-                        if (strstr(old_val,"&")) {old_val = yon_char_replace(old_val,"&","\003");old_val = yon_char_replace(old_val,"\003","&amp;");}
+                        if (strstr(old_val,"&")) {int sz = 0; config_str old_val_parsed = yon_char_parse(old_val,&sz,"&");old_val = yon_char_parsed_to_string(old_val_parsed,sz,"&amp;"); yon_char_parsed_free(old_val_parsed,sz);}
                         if (strstr(old_val,">")) old_val = yon_char_replace(old_val,">","&lt;");
                         if (strstr(old_val,"<")) old_val = yon_char_replace(old_val,"<","&gt;");
                     char *compare_string = yon_char_unite("\n",(char*)old_val,NULL);