diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java
index c058016d91..1a7b56f78f 100644
--- a/core/src/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/mindustry/world/blocks/units/UnitFactory.java
@@ -389,7 +389,7 @@ public class UnitFactory extends UnitBlock{
                             unit.command().commandPosition(commandPos);
                         }
 
-                        unit.command().command(command == null && payload.unit.type.defaultCommand != null ? payload.unit.type.defaultCommand : command);
+                        unit.command().command(command == null && unit.type.defaultCommand != null ? unit.type.defaultCommand : command);
                     }
 
                     payload = new UnitPayload(unit);
diff --git a/gradle.properties b/gradle.properties
index 0be7e3088e..7deb4aaf24 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=a39155a23e
+archash=dd60085a9d