diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 33dbfcec48..8d242d549a 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1924,7 +1924,7 @@ public class Blocks implements ContentList{
 
             instructionsPerTick = 5;
 
-            range = 8 * 20;
+            range = 8 * 22;
 
             size = 2;
         }};
@@ -1937,7 +1937,7 @@ public class Blocks implements ContentList{
 
             instructionsPerTick = 25;
 
-            range = 8 * 40;
+            range = 8 * 42;
 
             size = 3;
         }};
diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java
index fb7d29acfb..799f7551c4 100644
--- a/core/src/mindustry/content/UnitTypes.java
+++ b/core/src/mindustry/content/UnitTypes.java
@@ -1035,7 +1035,7 @@ public class UnitTypes implements ContentList{
             rotateShooting = false;
             hitsize = 15f;
             engineSize = 3f;
-            payloadCapacity = 4 * 8;
+            payloadCapacity = 4 * (8 * 8);
 
             weapons.add(
             new Weapon("heal-weapon-mount"){{
diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java
index 46e1b694e9..eb1c253f23 100644
--- a/core/src/mindustry/entities/comp/PayloadComp.java
+++ b/core/src/mindustry/entities/comp/PayloadComp.java
@@ -21,19 +21,19 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     Seq<Payload> payloads = new Seq<>();
 
     float payloadUsed(){
-        return payloads.sumf(Payload::size);
+        return payloads.sumf(p -> p.size() * p.size());
     }
 
     boolean canPickup(Unit unit){
-        return payloadUsed() + unit.hitSize <= type.payloadCapacity;
+        return payloadUsed() + unit.hitSize * unit.hitSize <= type.payloadCapacity;
     }
 
     boolean canPickup(Building build){
-        return payloadUsed() + build.block.size * Vars.tilesize <= type.payloadCapacity;
+        return payloadUsed() + build.block.size * build.block.size * Vars.tilesize * Vars.tilesize <= type.payloadCapacity;
     }
 
     boolean canPickupPayload(Payload pay){
-        return payloadUsed() + pay.size() <= type.payloadCapacity;
+        return payloadUsed() + pay.size()*pay.size() <= type.payloadCapacity;
     }
 
     boolean hasPayload(){