diff --git a/BetterSecondbot/DiscordSupervisor/Inbound.cs b/BetterSecondbot/DiscordSupervisor/Inbound.cs
index 90375d8..fc55a94 100644
--- a/BetterSecondbot/DiscordSupervisor/Inbound.cs
+++ b/BetterSecondbot/DiscordSupervisor/Inbound.cs
@@ -106,24 +106,25 @@ namespace BetterSecondBot.DiscordSupervisor
                     else
                     {
                         string[] bits = message.Content.Split("|||");
-                        if(bits.Length >= 2)
+                        string target = "None";
+                        if (bits.Length == 3)
                         {
-                            string target = "None";
-                            if (bits.Length == 3)
-                            {
-                                target = bits[2];
-                            }
-                            if (controler.Bot.getFullListOfCommands().Contains(bits[0].ToLowerInvariant()) == true)
-                            {
-                                controler.Bot.CallAPI(bits[0], bits[1].Split("~#~"), target);
-                                await MarkMessage(message, "✅").ConfigureAwait(false);
-                            }
-                            else
-                            {
-                                await MarkMessage(message, "❌").ConfigureAwait(false);
-                            }
+                            target = bits[2];
+                        }
+                        string args = "";
+                        if (bits.Length == 3)
+                        {
+                            args = bits[1];
+                        }
+                        if (controler.Bot.GetFullListOfCommandsWithCustoms().Contains(bits[0].ToLowerInvariant()) == true)
+                        {
+                            controler.Bot.CallAPI(bits[0], args.Split("~#~"), target);
+                            await MarkMessage(message, "✅").ConfigureAwait(false);
+                        }
+                        else
+                        {
+                            await MarkMessage(message, "❌").ConfigureAwait(false);
                         }
-                        await MarkMessage(message, "❌").ConfigureAwait(false);
                     }
                 }
             }
diff --git a/Core/bottypes/CommandsBot.cs b/Core/bottypes/CommandsBot.cs
index d13b75c..87ed196 100644
--- a/Core/bottypes/CommandsBot.cs
+++ b/Core/bottypes/CommandsBot.cs
@@ -149,6 +149,20 @@ namespace BetterSecondBot.bottypes
             return output.ToArray();
         }
 
+        public string[] GetFullListOfCommandsWithCustoms()
+        {
+            List<string> output = new List<string>();
+            foreach (string A in endpointcommandmap.Keys)
+            {
+                output.Add(A.ToLowerInvariant());
+            }
+            foreach(string A in custom_commands.Keys)
+            {
+                output.Add(A.ToLowerInvariant());
+            }
+            return output.ToArray();
+        }
+
         public void NotecardAddContent(string target_notecard_storage_id, string content)
         {
             NotecardAddContent(target_notecard_storage_id, content, true, "\n\r");