diff --git a/AutoQueueBG.lua b/AutoQueueBG.lua
index 4163438..1e5d812 100644
--- a/AutoQueueBG.lua
+++ b/AutoQueueBG.lua
@@ -83,7 +83,6 @@ end
 
 function AutoQueueBG:CheckRaidMember(raidMember)
   if     UnitExists(raidMember) == 1
-     and GetUnitName(raidMember) == playerName
      and UnitIsFriend(raidMember,"player") == 1
      and UnitIsDeadOrGhost(raidMember) == nil
      and UnitInRange(raidMember) == 1 then
@@ -196,6 +195,7 @@ function AutoQueueBG:BuffPlayers()
     if AutoQueueBG:CheckRaidMember(unit) then
       if AutoQueueBG:BuffDuration(unit, GetSpellInfo(GSDK)) < 15 then
         BuffPlayer(unit, GSDK)
+        return;
       end
     end
   end