diff --git a/.gitignore b/.gitignore
index 0e9a57f2..56db6720 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,7 @@ vendor.zip
 /Assets/StreamingAssets*
 /FMOD/.*
 fmod_editor.log
+
+# Visual Studio generated files
+.vs/
+.vsconfig
diff --git a/Assets/src/GrenadeExplodesAfterTime.cs b/Assets/src/GrenadeExplodesAfterTime.cs
index 92c0bb8a..cea2cd35 100644
--- a/Assets/src/GrenadeExplodesAfterTime.cs
+++ b/Assets/src/GrenadeExplodesAfterTime.cs
@@ -49,24 +49,22 @@ private void Explode() {
       damage: WaitingToThrow() ? DamageExplodingInHand : BulletData.Damage,
       origin: transform.position,
       radius: Radius,
-      canBeCounterAttacked: true,
+      canBeCounterAttacked: !BulletData.Originator.transform.IsChildOf(
+        PlayerGameObject.Current.transform
+      ),
       isDestructive: IsDestructive,
       damageCurve: DamageCurve,
       shouldDamage: (go) => {
-        if (!DamagesPlayer && go.tag == "Player")
+        if (!DamagesPlayer && go.CompareTag("Player"))
           return false;
-        if (!DamagesEnemies && go.tag == "Enemy")
+        if (!DamagesEnemies && go.CompareTag("Enemy"))
           return false;
         return true;
       }
     );
 
     // Send grenade back to originator on counterattack
-    if (
-      isCounterAttack
-      && BulletData.Originator
-      && BulletData.Originator != PlayerGameObject.Current
-    ) {
+    if (isCounterAttack && BulletData.Originator) {
       Vector3 toOriginator = (BulletData.Originator.transform.position - transform.position);
       Rigidbody.velocity = toOriginator * VelocityCoefficient;
       DamagesEnemies = true;