diff --git a/MikScrollingBattleText/MSBTParser.lua b/MikScrollingBattleText/MSBTParser.lua
index 66c3ef0..1e47853 100644
--- a/MikScrollingBattleText/MSBTParser.lua
+++ b/MikScrollingBattleText/MSBTParser.lua
@@ -24,6 +24,7 @@ local GetTime = GetTime
 local UnitClass = UnitClass
 local UnitGUID = UnitGUID
 local UnitName = UnitName
+local CombatLogGetCurrentEventInfo = CombatLogGetCurrentEventInfo
 local Print = MikSBT.Print
 local EraseTable = MikSBT.EraseTable
 
@@ -787,9 +788,8 @@ end
 local function OnEvent(this, event, arg1, arg2, ...)
 	-- Combat log events.
 	if (event == "COMBAT_LOG_EVENT_UNFILTERED") then
-		arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20 = CombatLogGetCurrentEventInfo()
-		ParseLogMessage(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17, arg18, arg19, arg20)
-
+		ParseLogMessage(CombatLogGetCurrentEventInfo())
+		
 	-- Mouseover changes.
 	elseif (event == "UPDATE_MOUSEOVER_UNIT") then
 		-- Map the GUID for the moused over unit to a class.