diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt
index 2192faf38..a404652a6 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/Ext.kt
@@ -209,7 +209,7 @@ fun ICapabilityProvider.getMatteryEnergySided(side: Direction? = null): LazyOpti
  * Contains all items that player might carry
  */
 fun Player.itemsStream(includeCosmetics: Boolean = true): Stream<out ItemStack> {
-	val streams = LinkedList<Stream<out ItemStack>>()
+	val streams = ArrayList<Stream<out ItemStack>>()
 	streams.add(inventory.stream())
 
 	matteryPlayer?.let {
@@ -226,7 +226,7 @@ fun Player.itemsStream(includeCosmetics: Boolean = true): Stream<out ItemStack>
 		streams.add(cosmeticArmorStream())
 	}
 
-	return Streams.concat(*streams.toTypedArray())
+	return streams.stream().flatMap { it }
 }
 
 /**
@@ -256,7 +256,7 @@ fun Player.allItemsStream(includeCosmetics: Boolean = true): Stream<out ItemStac
  * Contains all items that player might carry
  */
 fun Player.awareItemsStream(includeCosmetics: Boolean = false): Stream<out AwareItemStack> {
-	val streams = LinkedList<Stream<out AwareItemStack>>()
+	val streams = ArrayList<Stream<out AwareItemStack>>()
 	streams.add(inventory.awareStream())
 
 	matteryPlayer?.let {
@@ -273,7 +273,7 @@ fun Player.awareItemsStream(includeCosmetics: Boolean = false): Stream<out Aware
 		streams.add(cosmeticArmorAwareStream())
 	}
 
-	return Streams.concat(*streams.toTypedArray())
+	return streams.stream().flatMap { it }
 }
 
 /**
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt
index c230f0066..8b19adef7 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/curios/CuriosCompat.kt
@@ -87,7 +87,7 @@ private fun Player.curiosStreamImpl(includeCosmetics: Boolean): Stream<out ItemS
 		}
 	}
 
-	return Streams.concat(*result.toTypedArray())
+	return result.stream().flatMap { it }
 }
 
 fun Player.curiosStream(includeCosmetics: Boolean = true): Stream<out ItemStack> {