diff --git a/srcs/channel.cpp b/srcs/channel.cpp
index 0752ed5..98f11ac 100644
--- a/srcs/channel.cpp
+++ b/srcs/channel.cpp
@@ -6,13 +6,12 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/21 10:36:21 by maldavid          #+#    #+#             */
-/*   Updated: 2024/01/24 00:42:13 by vvaas            ###   ########.fr       */
+/*   Updated: 2024/01/24 12:52:25 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
 #include <channel.hpp>
 #include <logs.hpp>
-#include <iostream>
 #include <errorscode.hpp>
 
 namespace irc
diff --git a/srcs/server_functions.cpp b/srcs/server_functions.cpp
index c6c6a92..44805bd 100644
--- a/srcs/server_functions.cpp
+++ b/srcs/server_functions.cpp
@@ -6,7 +6,7 @@
 /*   By: vvaas <vvaas@student.42angouleme.fr>       +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/01/22 17:31:06 by maldavid          #+#    #+#             */
-/*   Updated: 2024/01/24 00:43:01 by vvaas            ###   ########.fr       */
+/*   Updated: 2024/01/24 12:52:32 by maldavid         ###   ########.fr       */
 /*                                                                            */
 /******************************************************************************/
 
@@ -174,7 +174,13 @@ namespace irc
 		{
 			if(msg.getTokens()[1] == it->getName())
 			{
-				it->handleMessage(msg.getTokens()[2], client);
+				std::string complete_msg;
+				for(std::vector<std::string>::const_iterator tit = msg.getTokens().begin(); tit != msg.getTokens().end(); ++it)
+				{
+					complete_msg.append(*tit);
+					complete_msg.append(" ");
+				}
+				it->handleMessage(complete_msg, client);
 				break;
 			}
 		}