diff --git a/core/src/mindustry/core/Control.java b/core/src/mindustry/core/Control.java
index e4f84b8d38..c8ec84674f 100644
--- a/core/src/mindustry/core/Control.java
+++ b/core/src/mindustry/core/Control.java
@@ -383,6 +383,8 @@ public class Control implements ApplicationListener, Loadable{
                         Groups.fire.clear();
                         Groups.puddle.clear();
 
+                        //reset to 0, so replaced cores don't count
+                        state.rules.defaultTeam.data().unitCap = 0;
                         Schematics.placeLaunchLoadout(spawn.x, spawn.y);
 
                         //set up camera/player locations
diff --git a/core/src/mindustry/world/draw/DrawAnimation.java b/core/src/mindustry/world/draw/DrawAnimation.java
index f0699634a4..14b2b8d6b7 100644
--- a/core/src/mindustry/world/draw/DrawAnimation.java
+++ b/core/src/mindustry/world/draw/DrawAnimation.java
@@ -45,6 +45,6 @@ public class DrawAnimation extends DrawBlock{
 
     @Override
     public TextureRegion[] icons(Block block){
-        return new TextureRegion[]{block.region, top};
+        return top.found() ? new TextureRegion[]{block.region, top} : new TextureRegion[]{block.region};
     }
 }