diff --git a/core/src/mindustry/ai/UnitCommand.java b/core/src/mindustry/ai/UnitCommand.java
index 0cc864fd83..20cec778bd 100644
--- a/core/src/mindustry/ai/UnitCommand.java
+++ b/core/src/mindustry/ai/UnitCommand.java
@@ -65,6 +65,10 @@ public class UnitCommand{
         return Icon.icons.get(icon, Icon.cancel);
     }
 
+    public char getEmoji() {
+        return (char) Iconc.codes.get(icon, Iconc.cancel);
+    }
+
     @Override
     public String toString(){
         return "UnitCommand:" + name;
diff --git a/core/src/mindustry/entities/Units.java b/core/src/mindustry/entities/Units.java
index 1a5d024b1c..184203a9b7 100644
--- a/core/src/mindustry/entities/Units.java
+++ b/core/src/mindustry/entities/Units.java
@@ -408,7 +408,7 @@ public class Units{
         if(team != null){
             team.data().tree().intersect(x, y, width, height, cons);
         }else{
-            for(var other : state.teams.getActive()){
+            for(var other : state.teams.present){
                 other.tree().intersect(x, y, width, height, cons);
             }
         }