diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDeathsGrasp.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDeathsGrasp.java
index 66ac42e26..3bcbf1db5 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDeathsGrasp.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkDeathsGrasp.java
@@ -29,13 +29,13 @@ import mineplex.core.common.util.UtilParticle;
 import mineplex.core.common.util.UtilParticle.ParticleType;
 import mineplex.core.common.util.UtilParticle.ViewDist;
 import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.common.util.UtilServer;
 import mineplex.core.common.util.UtilTime;
 import mineplex.core.recharge.Recharge;
 import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.damage.CustomDamageEvent;
 
+import nautilus.game.arcade.game.games.smash.TeamSuperSmash;
 import nautilus.game.arcade.kit.Perk;
 
 public class PerkDeathsGrasp extends Perk
@@ -97,6 +97,7 @@ public class PerkDeathsGrasp extends Perk
 		{
 			return;
 		}
+		
 
 		//Leap End & Collide
 		for(Iterator<Entry<UUID, Long>> it = _live.entrySet().iterator(); it.hasNext();)
@@ -106,14 +107,16 @@ public class PerkDeathsGrasp extends Perk
 			if(player == null)
 			{
 				it.remove();
+				return;
 			}
-			
-			if (UtilEnt.isGrounded(player) || UtilTime.elapsed(e.getValue(), LEAP_DURATION))
+						
+			if (UtilEnt.isGrounded(player) && UtilTime.elapsed(e.getValue(), LEAP_DURATION))
 			{
 				it.remove();
+				return;
 			}
 			
-			List<Player> team = Manager.GetGame().GetTeam(player).GetPlayers(true);
+			List<Player> team = TeamSuperSmash.getTeam(Manager, player, true);
 			for (Player other : Manager.GetGame().GetPlayers(true))
 			{
 				if(team.contains(other))