diff --git a/core/src/mindustry/entities/bullet/RailBulletType.java b/core/src/mindustry/entities/bullet/RailBulletType.java
index 4ddc6e36c7..aa5136e7fc 100644
--- a/core/src/mindustry/entities/bullet/RailBulletType.java
+++ b/core/src/mindustry/entities/bullet/RailBulletType.java
@@ -63,6 +63,11 @@ public class RailBulletType extends BulletType{
         }
     }
 
+    @Override
+    public boolean testCollision(Bullet bullet, Building tile){
+        return bullet.team != tile.team;
+    }
+
     @Override
     public void hitEntity(Bullet b, Hitboxc entity, float initialHealth){
         handle(b, entity, initialHealth);
diff --git a/core/src/mindustry/entities/comp/ShieldComp.java b/core/src/mindustry/entities/comp/ShieldComp.java
index 3ca002b288..5a489686ff 100644
--- a/core/src/mindustry/entities/comp/ShieldComp.java
+++ b/core/src/mindustry/entities/comp/ShieldComp.java
@@ -50,6 +50,7 @@ abstract class ShieldComp implements Healthc, Posc{
 
         float shieldDamage = Math.min(Math.max(shield, 0), amount);
         shield -= shieldDamage;
+        hitTime = 1f;
         amount -= shieldDamage;
 
         if(amount > 0){