diff --git a/core/src/mindustry/entities/comp/BuilderComp.java b/core/src/mindustry/entities/comp/BuilderComp.java
index 0aafd4d0c0..0ef4d8bed0 100644
--- a/core/src/mindustry/entities/comp/BuilderComp.java
+++ b/core/src/mindustry/entities/comp/BuilderComp.java
@@ -207,7 +207,8 @@ abstract class BuilderComp implements Unitc{
         BuildPlan plan = buildPlan();
         Tile tile = world.tile(plan.x, plan.y);
 
-        if((!within(tile, buildingRange) && !state.isEditor()) || tile == null){
+
+        if(tile == null || (!within(tile, buildingRange) && !state.isEditor())){
             return;
         }
 
diff --git a/core/src/mindustry/entities/comp/CommanderComp.java b/core/src/mindustry/entities/comp/CommanderComp.java
index 124eb06d91..2fe2bf83a0 100644
--- a/core/src/mindustry/entities/comp/CommanderComp.java
+++ b/core/src/mindustry/entities/comp/CommanderComp.java
@@ -30,7 +30,7 @@ abstract class CommanderComp implements Entityc, Posc{
 
     public void update(){
         if(formation != null){
-            formation.anchor.set(x, y, /*rotation*/ 0); //TODO rotation set to 0 because rotating is pointless
+            formation.anchor.set(x, y, 0);
             formation.updateSlots();
         }
     }