diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index ad6be1c..41904cd 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -64,11 +64,16 @@ add_custom_target(
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C}
 )
 
-
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \
 	-O2 -pipe -fno-plt -fexceptions \
         -Wformat -Werror=format-security \
         -fstack-clash-protection -fcf-protection")
+
+string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)
+
+if(FORTIFY_FOUND EQUAL -1)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wp,-D_FORTIFY_SOURCE=2")
+endif()
         
 string(FIND "${CMAKE_CXX_FLAGS}" "-D_FORTIFY_SOURCE" FORTIFY_FOUND)
 
@@ -80,17 +85,18 @@ set(SOURCE_FILES
         ubl-settings-kernel.c
         ubl-settings-kernel.h
         ubl-strings.h
-        )
+)
 
 set(LIBRARIES
         ${GTK_LIBRARIES}
         ${WEBKIT_LIBRARIES}
         ${UTILS_LIBRARIES}
-       ${VTE291_LIBRARIES}
+        ${VTE291_LIBRARIES}
         pthread
         ublsettings
         ublsettings-gtk3
-        ublsettingsui-gtk3)
+        ublsettingsui-gtk3
+)
 
 
 add_executable(${PROJECT_NAME} ${SOURCE_FILES} ${CMAKE_CURRENT_BINARY_DIR}/${GRESOURCE_C})
diff --git a/source/ubl-settings-kernel.c b/source/ubl-settings-kernel.c
index 2be8423..04b73ec 100644
--- a/source/ubl-settings-kernel.c
+++ b/source/ubl-settings-kernel.c
@@ -614,7 +614,7 @@ void on_module_remove_clicked(GtkWidget *self,dictionary *dict){
         char *target = yon_package_string_set(tab->module);
         char *command = remove_command(target);
         char *command_unload = unload_command(target);
-        system(yon_debug_output("%s\n",command_unload));
+        if (system(yon_debug_output("%s\n",command_unload))){};
         g_signal_connect(G_OBJECT(widgets->InstallTerminal),"child-exited",G_CALLBACK(on_module_remove_done),tab);
         yon_command_execute_async(command,widgets);
         tab->module_installed=0;