diff --git a/src/main/scala/li/cil/oc/server/agent/Inventory.scala b/src/main/scala/li/cil/oc/server/agent/Inventory.scala
index 055b9fc26..14333c1e4 100644
--- a/src/main/scala/li/cil/oc/server/agent/Inventory.scala
+++ b/src/main/scala/li/cil/oc/server/agent/Inventory.scala
@@ -8,6 +8,7 @@ import net.minecraft.entity.player.InventoryPlayer
 import net.minecraft.item.Item
 import net.minecraft.item.ItemStack
 import net.minecraft.nbt.NBTTagList
+import li.cil.oc.util.ExtendedInventory._
 
 class Inventory(val agent: internal.Agent) extends InventoryPlayer(null) {
   def selectedItemStack = agent.mainInventory.getStackInSlot(agent.selectedSlot)
@@ -54,8 +55,7 @@ class Inventory(val agent: internal.Agent) extends InventoryPlayer(null) {
   }
 
   override def addItemStackToInventory(stack: ItemStack) = {
-    val indices = 0 until getSizeInventory
-    val slots = indices.drop(agent.selectedSlot) ++ indices.take(agent.selectedSlot)
+    val slots = this.indices.drop(agent.selectedSlot) ++ this.indices.take(agent.selectedSlot)
     InventoryUtils.insertIntoInventory(stack, this, slots = Option(slots))
   }