diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
index c5ed7374..7cb4e223 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/world/World.kt
@@ -42,6 +42,7 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
 		abstract fun chunk(value: Double): Double
 
 		abstract fun inBounds(value: Int): Boolean
+		abstract fun inBoundsChunk(value: Int): Boolean
 
 		protected fun positiveModulo(a: Int, b: Int): Int {
 			val result = a % b
@@ -67,6 +68,7 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
 		override fun chunk(value: Double): Double = value
 
 		override fun inBounds(value: Int) = true
+		override fun inBoundsChunk(value: Int) = true
 	}
 
 	class CoordinatesWrapper(private val cell: Int, private val chunk: Int) : AbstractCoordinatesWrapper() {
@@ -74,6 +76,10 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
 			return value in 0 until cell
 		}
 
+		override fun inBoundsChunk(value: Int): Boolean {
+			return value in 0 until chunk
+		}
+
 		override fun cell(value: Int): Int {
 			return positiveModulo(value, cell)
 		}
@@ -100,6 +106,10 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
 			return value in 0 until cell
 		}
 
+		override fun inBoundsChunk(value: Int): Boolean {
+			return value in 0 until chunk
+		}
+
 		override fun cell(value: Int): Int {
 			return value.coerceIn(0, cell - 1)
 		}
@@ -401,13 +411,13 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
 	/**
 	 * Возвращает все чанки, которые пересекаются с заданным [boundingBox]
 	 */
-	open fun collect(boundingBox: AABBi): List<ChunkType> {
+	fun collect(boundingBox: AABBi): List<ChunkType> {
 		val output = ArrayList<ChunkType>()
 
 		for (pos in boundingBox.chunkPositions) {
 			val chunk = chunkMap[pos]
 
-			if (chunk != null && chunk !in output) {
+			if (chunk != null && (loopX || chunkMap.x.inBoundsChunk(pos.x)) && (loopY || chunkMap.y.inBoundsChunk(pos.y))) {
 				output.add(chunk)
 			}
 		}
@@ -418,13 +428,13 @@ abstract class World<This : World<This, ChunkType>, ChunkType : Chunk<This, Chun
 	/**
 	 * Возвращает все чанки, которые пересекаются с заданным [boundingBox]
 	 */
-	open fun collectPositionAware(boundingBox: AABBi): List<Pair<ChunkPos, ChunkType>> {
+	fun collectPositionAware(boundingBox: AABBi): List<Pair<ChunkPos, ChunkType>> {
 		val output = ArrayList<Pair<ChunkPos, ChunkType>>()
 
 		for (pos in boundingBox.chunkPositions) {
 			val chunk = chunkMap[pos]
 
-			if (chunk != null && !output.any { it.second === chunk }) {
+			if (chunk != null && (loopX || chunkMap.x.inBoundsChunk(pos.x)) && (loopY || chunkMap.y.inBoundsChunk(pos.y))) {
 				output.add(pos to chunk)
 			}
 		}