diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidConversionMonitor.java b/src/main/java/com/glodblock/github/common/item/ItemFluidConversionMonitor.java
index e8185fb32..f9d24db06 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemFluidConversionMonitor.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemFluidConversionMonitor.java
@@ -29,7 +29,7 @@ public ItemFluidConversionMonitor() {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidExportBus.java b/src/main/java/com/glodblock/github/common/item/ItemFluidExportBus.java
index 77923a173..d118a6ef4 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemFluidExportBus.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemFluidExportBus.java
@@ -36,7 +36,7 @@ public PartFluidExportBus createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidImportBus.java b/src/main/java/com/glodblock/github/common/item/ItemFluidImportBus.java
index 988bb67d9..a216e2890 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemFluidImportBus.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemFluidImportBus.java
@@ -36,7 +36,7 @@ public PartFluidImportBus createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java b/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java
index 6bff64ad5..5b9cc09d0 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemFluidLevelEmitter.java
@@ -39,7 +39,7 @@ public IPart createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidStorageMonitor.java b/src/main/java/com/glodblock/github/common/item/ItemFluidStorageMonitor.java
index 4c1c47306..da7ced436 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemFluidStorageMonitor.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemFluidStorageMonitor.java
@@ -29,7 +29,7 @@ public ItemFluidStorageMonitor() {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidInterface.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidInterface.java
index c393c492c..79913f2d3 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidInterface.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartFluidInterface.java
@@ -34,7 +34,7 @@ public PartFluidInterface createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidP2PInterface.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidP2PInterface.java
index 117eb35a1..065c02a35 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidP2PInterface.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartFluidP2PInterface.java
@@ -40,7 +40,7 @@ public IPart createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java
index 37191f381..282865989 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminal.java
@@ -37,7 +37,7 @@ public PartFluidPatternTerminal createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java
index 438ecf66e..69054e86b 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartFluidPatternTerminalEx.java
@@ -37,7 +37,7 @@ public PartFluidPatternTerminalEx createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidStorageBus.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidStorageBus.java
index 4bce8c014..ee1826bd7 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidStorageBus.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartFluidStorageBus.java
@@ -38,7 +38,7 @@ public PartFluidStorageBus createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java
index 3ee3ec1b1..5e31ef3e1 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartFluidTerminal.java
@@ -39,7 +39,7 @@ public PartFluidTerminal createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override
diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartLevelTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemPartLevelTerminal.java
index 9b22f9529..fefcbf8d1 100644
--- a/src/main/java/com/glodblock/github/common/item/ItemPartLevelTerminal.java
+++ b/src/main/java/com/glodblock/github/common/item/ItemPartLevelTerminal.java
@@ -39,7 +39,7 @@ public PartLevelTerminal createPartFromItemStack(ItemStack is) {
     @Override
     public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
             float xOffset, float yOffset, float zOffset) {
-        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+        return AEApi.instance().partHelper().placeBus(stack, x, y, z, side, player, world);
     }
 
     @Override