diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt
index b730e9b4a..c8bc3e8df 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/player/MatteryPlayer.kt
@@ -509,8 +509,8 @@ class MatteryPlayer(val ply: Player) {
 			}
 		}
 
-		val input = MatteryContainer(Runnable { notify(IdleReason.ITEM) }, 1)
-		val output = MatteryContainer(Runnable { notify(IdleReason.ITEM) }, 1)
+		val input = EnhancedContainer.WithListener(1) { notify(IdleReason.ITEM) }
+		val output = EnhancedContainer.WithListener(1) { notify(IdleReason.ITEM) }
 
 		init {
 			savetables.stateful(::input, "exopack_smelter_input_$index")
@@ -539,7 +539,7 @@ class MatteryPlayer(val ply: Player) {
 	 */
 	val exopackEnergy = ProfiledEnergyStorage(BatteryBackedEnergyStorage(ply, syncher, Decimal.ZERO, ExopackConfig.ENERGY_CAPACITY, false, onChange = { for (v in smelters) v.notify(MachineJobEventLoop.IdleReason.POWER) }))
 
-	val exopackChargeSlots = MatteryContainer(4)
+	val exopackChargeSlots = EnhancedContainer.Simple(4)
 	var acceptExopackChargeFromWirelessCharger = true
 
 	init {