diff --git a/Client.lua b/Client.lua
index 0cd6966..47949fe 100644
--- a/Client.lua
+++ b/Client.lua
@@ -117,8 +117,7 @@ function LootReserve.Client:Init()
     
     self.RollOnLoot = _G.RollOnLoot
     _G.RollOnLoot = function(...)
-        local args = {...};
-        local success, result = pcall(function() LootReserveRollOnLoot(unpack(args)) end);
+        local success, result = pcall(function(...) LootReserveRollOnLoot(...) end, ...);
         if not success or not result then
             self.RollOnLoot(...)
         end
diff --git a/LootReserve.lua b/LootReserve.lua
index b1f3470..0a515af 100644
--- a/LootReserve.lua
+++ b/LootReserve.lua
@@ -829,10 +829,6 @@ local function CheckBagCache(self)
             LootReserve:WipeBagCache();
             C_Timer.After(0, function() LootReserve:WipeBagCache(); end);
         end);
-        LootReserve:RegisterEvent("MERCHANT_CONFIRM_TRADE_TIMER_REMOVAL", function()
-            LootReserve:WipeBagCache();
-            C_Timer.After(0, function() LootReserve:WipeBagCache(); end);
-        end);
         self:RegisterEvent("ITEM_LOCK_CHANGED", function(bag, slot)
             if not slot then return; end
             if self.BagCache then