diff --git a/lib/HahaCommands/download.ex b/lib/HahaCommands/download.ex
index 9f17f51..0459b4b 100644
--- a/lib/HahaCommands/download.ex
+++ b/lib/HahaCommands/download.ex
@@ -22,11 +22,10 @@ defmodule HahaYes.Commands.Download do
 
     Bot: <video file>
   """
-  def execute(msg, _ws_state) do
+  def execute(msg, _ws_state, args) do
     {:ok, loading} = Api.create_message(msg.channel_id, "Downloading...")
 
-    arg = String.replace(msg.content, "h3h3 download ", "")
-    opt = ["-f", "bestvideo[height<=?480]+bestaudio/best", arg, "-o", "#{System.tmp_dir}/#{msg.id}.%(ext)si", "--force-overwrites", "--playlist-reverse", "--no-playlist", "--remux-video=mp4/webm/mov", "--no-warnings"];
+    opt = ["-f", "bestvideo[height<=?480]+bestaudio/best", args, "-o", "#{System.tmp_dir}/#{msg.id}.%(ext)si", "--force-overwrites", "--playlist-reverse", "--no-playlist", "--remux-video=mp4/webm/mov", "--no-warnings"];
 
     System.cmd("yt-dlp", opt)
 
diff --git a/lib/HahaCommands/ping.ex b/lib/HahaCommands/ping.ex
index 955c8db..423b10e 100644
--- a/lib/HahaCommands/ping.ex
+++ b/lib/HahaCommands/ping.ex
@@ -15,7 +15,7 @@ defmodule HahaYes.Commands.Ping do
     Bot: Pong!
   """
 
-  def execute(msg, _ws_state) do
+  def execute(msg, _ws_state, _args) do
     Api.create_message(msg.channel_id, "Pong!")
   end
 end
diff --git a/lib/events/messages.ex b/lib/events/messages.ex
index 075a2a6..a0007ee 100644
--- a/lib/events/messages.ex
+++ b/lib/events/messages.ex
@@ -13,7 +13,7 @@ defmodule HahaYes.Events.MessagesConsumer do
       |> Enum.at(0)
       |> String.downcase()
       |> String.capitalize()
-      |> then(& apply(String.to_atom("#{HahaYes.Commands}.#{&1}"), :execute, [msg, ws_state]))
+      |> then(& apply(String.to_atom("#{HahaYes.Commands}.#{&1}"), :execute, [msg, ws_state, String.replace(msg.content, "h3h3 download ", "")]))
     end
   end
 end