diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index b4d98a2..3bea421 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -66,8 +66,10 @@ add_definitions(-DVTE_INCLUDE)
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+        -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection")
+        
+string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)
       
 
 set(SOURCE_FILES
diff --git a/source/ubl-settings-services.c b/source/ubl-settings-services.c
index 5ec877e..4e167e9 100644
--- a/source/ubl-settings-services.c
+++ b/source/ubl-settings-services.c
@@ -57,13 +57,13 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
 			if (!yon_char_is_empty(file)){
 				path=file;
 			}
+            yon_config_clean();
+            char *command = yon_config_get_custom_command(path);
+            yon_config_load_config(type,command,NULL);
 			gtk_widget_destroy(dialog);
 		} else {
 			gtk_widget_destroy(dialog);
 		}
-		yon_config_clean();
-        char *command = yon_config_get_custom_command(path);
-		yon_config_load_config(type,command,NULL);
 	}
 }
 
diff --git a/ubl-settings-services.glade b/ubl-settings-services.glade
index d80920c..93a428e 100644
--- a/ubl-settings-services.glade
+++ b/ubl-settings-services.glade
@@ -1185,10 +1185,10 @@
                       <item translatable="yes">Autolaunch in configuration</item>
                       <item translatable="yes">Stopped in configuration</item>
                       <item translatable="yes">Blocked in configuration</item>
-                      <item id="service">Service</item>
                       <item id="automount">Automount</item>
                       <item id="device">Device</item>
                       <item id="path">Path</item>
+                      <item id="service">Service</item>
                       <item id="scope">Scope</item>
                       <item id="slice">Slice</item>
                       <item id="socket">Socket</item>