diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/util/NotNullTwoDimensionalArray.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/util/NotNullTwoDimensionalArray.kt
index 6782b8fd..0433b35f 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/util/NotNullTwoDimensionalArray.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/util/NotNullTwoDimensionalArray.kt
@@ -1,6 +1,7 @@
 package ru.dbotthepony.kstarbound.util
 
 import it.unimi.dsi.fastutil.objects.ObjectSpliterators
+import java.util.*
 import java.util.stream.Stream
 import java.util.stream.StreamSupport
 import kotlin.reflect.KClass
@@ -53,7 +54,7 @@ class NotNullTwoDimensionalArray<T : Any>(clazz: KClass<T>, private val width: I
 	}
 
 	fun stream(): Stream<out T> {
-		return StreamSupport.stream(ObjectSpliterators.wrap(memory), false)
+		return Arrays.stream(memory)
 	}
 
 	fun indexedStream(): Stream<out Entry<T>> {
diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/util/TwoDimensionalArray.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/util/TwoDimensionalArray.kt
index 39eb3003..403475dc 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/util/TwoDimensionalArray.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/util/TwoDimensionalArray.kt
@@ -1,6 +1,7 @@
 package ru.dbotthepony.kstarbound.util
 
 import it.unimi.dsi.fastutil.objects.ObjectSpliterators
+import java.util.Arrays
 import java.util.stream.Stream
 import java.util.stream.StreamSupport
 import kotlin.reflect.KClass
@@ -45,7 +46,7 @@ class TwoDimensionalArray<T : Any>(clazz: KClass<T>, private val width: Int, pri
 	}
 
 	fun stream(): Stream<out T?> {
-		return StreamSupport.stream(ObjectSpliterators.wrap(memory), false)
+		return Arrays.stream(memory)
 	}
 
 	fun indexedStream(): Stream<out Entry<T?>> {