diff --git a/src/main/java/org/ultramine/commands/basic/TechCommands.java b/src/main/java/org/ultramine/commands/basic/TechCommands.java
index 5ec4f10..c327a9a 100644
--- a/src/main/java/org/ultramine/commands/basic/TechCommands.java
+++ b/src/main/java/org/ultramine/commands/basic/TechCommands.java
@@ -428,7 +428,7 @@
 		WorldServer world = ctx.getSenderAsPlayer().getServerForPlayer();
 		int dim = world.provider.dimensionId;
 		int radius = ctx.contains("radius") ? ctx.get("radius").asInt(1) : -1;
-		int cpt = ctx.contains("cpt") ? ctx.get("cpt").asInt(1) : 1;
+		int cpt = ctx.contains("cpt") ? ctx.get("cpt").asInt(1) : 20;
 		
 		int x = MathHelper.floor_double(ctx.getSenderAsPlayer().posX);
 		int z = MathHelper.floor_double(ctx.getSenderAsPlayer().posZ);
@@ -436,7 +436,7 @@
 		if(radius == -1 && world.getConfig().borders.length == 0)
 			ctx.failure("command.genworld.noborder");
 		
-		worldgen = radius == -1 ? new WorldGenerator(dim, cpt) : new WorldGenerator(dim, x, z, radius, cpt);
+		worldgen = radius == -1 ? new WorldGenerator(dim, cpt) : new WorldGenerator(dim, cpt, x, z, radius);
 		FMLCommonHandler.instance().bus().register(worldgen);
 		ctx.sendMessage("command.genworld.start");
 	}
diff --git a/src/main/java/org/ultramine/server/WorldBorder.java b/src/main/java/org/ultramine/server/WorldBorder.java
index 4ed768c..fa8eeaf 100644
--- a/src/main/java/org/ultramine/server/WorldBorder.java
+++ b/src/main/java/org/ultramine/server/WorldBorder.java
@@ -39,7 +39,7 @@
 	
 	public boolean isChunkInsideBorder(int cx, int cz)
 	{
-		return isInsideBorder(cx << 4, cz << 4);
+		return isInsideBorder(cx >> 4, cz >> 4);
 	}
 	
 	public ChunkPosition correctPosition(int x, int z)