diff --git a/Makefile b/Makefile
index 83c803c..e8e4ffd 100644
--- a/Makefile
+++ b/Makefile
@@ -75,6 +75,9 @@ TERMINAL_ARGS2 		:= --geometry=10x30 -e
 # OPEN_NEW_TERMINAL	:= kitty
 
 test: comp
+	ipcrm --all=sem
+	ipcrm --all=msg
+	ipcrm --all=shm
 	$(OPEN_NEW_TERMINAL) $(TERMINAL_ARGS1) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT1)
 	$(OPEN_NEW_TERMINAL) $(TERMINAL_ARGS2) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT2)
 	./$(TARGET1) $(ARGSSERVER)
diff --git a/src/client.c b/src/client.c
index 1d30aad..2228e86 100644
--- a/src/client.c
+++ b/src/client.c
@@ -25,12 +25,12 @@ void setupClient(int argc, char *argv[]) {
     // CHECK INPUT
     checkClientinput(argc, argv);
 
-    // SIGNAL
-    setupClientSignalHandler();
-
     // MSGQ
     setupClientMsgq();
     printf("msgq: %d\n", _MSGQID);
+    
+    // SIGNAL
+    setupClientSignalHandler();
 
     // SHM
     setupClientShm();
diff --git a/src/custom_sig.c b/src/custom_sig.c
index 72f4c6b..0d4a917 100644
--- a/src/custom_sig.c
+++ b/src/custom_sig.c
@@ -20,7 +20,7 @@ pid_t _PIDS[2];
 void setServerSignal(int sig);
 
 void sigIntHandler2(int sig) {
-    exit(0);
+    kill(getpid(), SIGTERM);
 }
 
 void sigHandlerServer(int sig) {