diff --git a/!DebugTools/Blizzard_DebugTools.lua b/!DebugTools/Blizzard_DebugTools.lua
index e0016e0..a193c29 100644
--- a/!DebugTools/Blizzard_DebugTools.lua
+++ b/!DebugTools/Blizzard_DebugTools.lua
@@ -106,12 +106,12 @@ function EventTraceFrame_OnEvent (self, event, ...)
 			self.framesSinceLast[nextIndex] = 0;
 			self.eventids[nextIndex] = GetCurrentEventID();
 
-			local numArgs = select("#", arg);
+			local numArgs = select("#", unpack(arg));
 			for i=1, numArgs do
 				if (not self.args[i]) then
 					self.args[i] = {};
 				end
-				self.args[i][nextIndex] = select(i, arg);
+				self.args[i][nextIndex] = arg[i];
 			end
 
 			if (self.eventsToCapture) then
diff --git a/!DebugTools/Blizzard_DebugTools.xml b/!DebugTools/Blizzard_DebugTools.xml
index 582e455..2a29101 100644
--- a/!DebugTools/Blizzard_DebugTools.xml
+++ b/!DebugTools/Blizzard_DebugTools.xml
@@ -375,7 +375,7 @@
 				EventTraceFrame_OnShow(this);
 			</OnShow>
 			<OnEvent>
-				EventTraceFrame_OnEvent(this, event, arg);
+				EventTraceFrame_OnEvent(this, event, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15);
 			</OnEvent>
 			<OnUpdate>
 				EventTraceFrame_OnUpdate(this, arg1);