diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 73ef1b419c..435f5c65f5 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -27,7 +27,10 @@ import io.anuke.ucore.core.*;
 import io.anuke.ucore.entities.EntityQuery;
 import io.anuke.ucore.graphics.Draw;
 import io.anuke.ucore.modules.Module;
-import io.anuke.ucore.util.*;
+import io.anuke.ucore.util.Atlas;
+import io.anuke.ucore.util.Bundles;
+import io.anuke.ucore.util.Strings;
+import io.anuke.ucore.util.Timer;
 
 import java.io.IOException;
 
@@ -66,11 +69,10 @@ public class Control extends Module{
 
         content.initialize(Content::init);
         Core.atlas = new Atlas("sprites.atlas");
+        scaling = 1f / Draw.region("blank").getRegionWidth();
         Core.atlas.setErrorRegion("error");
         content.initialize(Content::load);
 
-        scaling = 1f / Draw.region("blank").getRegionWidth();
-
         unlocks.load();
 
         Sounds.setFalloff(9000f);
diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java
index b577095416..a72219ada9 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Floor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java
@@ -87,7 +87,7 @@ public class Floor extends Block{
 
                 TextureRegion result = new TextureRegion();
 
-                int padSize = (int)(tilesize/2/scaling);
+                int padSize = (int)(tilesize/scaling/2);
                 int texSize = (int)(tilesize/scaling);
                 int totSize = padSize + texSize;