diff --git a/src/main/java/InnaIrcBot/BotStart.java b/src/main/java/InnaIrcBot/BotStart.java
index 5fc4565..16c5b91 100644
--- a/src/main/java/InnaIrcBot/BotStart.java
+++ b/src/main/java/InnaIrcBot/BotStart.java
@@ -55,7 +55,7 @@ public class BotStart {
         final Option configurationOption = Option.builder("c")
                 .longOpt("configuration")
                 .desc("Start with configuration")
-                .hasArg(true)
+                .hasArgs()
                 .build();
 
         final Option generateOption = Option.builder("g")
diff --git a/src/main/java/InnaIrcBot/Commanders/CTCPHelper.java b/src/main/java/InnaIrcBot/Commanders/CTCPHelper.java
index d57d2b1..9c58a42 100644
--- a/src/main/java/InnaIrcBot/Commanders/CTCPHelper.java
+++ b/src/main/java/InnaIrcBot/Commanders/CTCPHelper.java
@@ -39,7 +39,6 @@ public class CTCPHelper {
 
     public void handleCtcpReply(String serverReplied, String whoReplied, String whatReplied){
         LocalDateTime currentTime = LocalDateTime.now();
-
         if (! waitersQueue.containsKey(serverReplied))
             return;
 
diff --git a/src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java b/src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java
index 590461a..b4217a1 100644
--- a/src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java
+++ b/src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java
@@ -12,11 +12,12 @@ public class StreamProvider {
 
     public static synchronized void writeToStream(String server, String message){
         try {
+            if (message.matches("(^.+?\\s)INNA")) {
+                SystemConsumer.getSystemConsumer(server).add("INNA "+message);
+                return;
+            }
             srvStreamMap.get(server).write(message+"\n");
             srvStreamMap.get(server).flush();
-            if (message.startsWith("PRIVMSG ")) {
-                SystemConsumer.getSystemConsumer(server).add("INNA "+message);
-            }
         } catch (IOException e){
             System.out.println("Internal issue: StreamProvider->writeToStream() caused I/O exception:\n\t"+e.getMessage());
         }