diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt
index 67b6badd..2b3bbb0d 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/Main.kt
@@ -107,7 +107,7 @@ fun main() {
 		var set = 0L
 		var parse = 0L
 
-		for (chunkX in 0 .. 61) {
+		for (chunkX in 0 .. 94) {
 			for (chunkY in 0 .. 61) {
 				var t = System.currentTimeMillis()
 				val data = db.read(byteArrayOf(1, 0, chunkX.toByte(), 0, chunkY.toByte()))
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
index 2e48ac17..9ac78823 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/client/StarboundClient.kt
@@ -125,7 +125,7 @@ class StarboundClient : AutoCloseable {
 
 	val gl = GLStateTracker()
 
-	var world: ClientWorld? = ClientWorld(this, 0L, 0)
+	var world: ClientWorld? = ClientWorld(this, 0L, 94)
 
 	fun ensureSameThread() = gl.ensureSameThread()
 
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
index 77315c7e..bfc96c9e 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
@@ -258,7 +258,7 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
 	 */
 	open fun computeIfAbsent(pos: ChunkPos): ChunkType {
 		@Suppress("Name_Shadowing")
-		val pos = pos.circular(widthInChunks)
+		val pos = if (isCircular) pos.circular(widthInChunks) else pos
 
 		val _lastAccessedChunk = lastAccessedChunk