diff --git a/parts/p2p/PartP2PTunnel.java b/parts/p2p/PartP2PTunnel.java
index 6537e303..a5670dfe 100644
--- a/parts/p2p/PartP2PTunnel.java
+++ b/parts/p2p/PartP2PTunnel.java
@@ -82,7 +82,6 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
 						{
 							PartP2PTunnel newTunnel = (PartP2PTunnel) newBus;
 							newTunnel.output = true;
-							newTunnel.onChange();
 
 							try
 							{
@@ -93,6 +92,8 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
 							{
 								// :P
 							}
+
+							newTunnel.onChange();
 						}
 
 						mc.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED );
@@ -160,6 +161,8 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
 						// :P
 					}
 				}
+
+				tile.worldObj.notifyBlocksOfNeighborChange( tile.xCoord, tile.yCoord, tile.zCoord, 0 );
 				return true;
 			}
 		}
@@ -260,8 +263,8 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
 		rh.setBounds( 2, 2, 14, 14, 14, 16 );
 		rh.renderInventoryBox( renderer );
 
-		rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), is.getIconIndex(),
-				CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
+		rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(),
+				is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
 
 		rh.setBounds( 2, 2, 14, 14, 14, 16 );
 		rh.renderInventoryBox( renderer );
@@ -281,8 +284,8 @@ public class PartP2PTunnel<T extends PartP2PTunnel> extends PartBasicState
 		rh.setBounds( 2, 2, 14, 14, 14, 16 );
 		rh.renderBlock( x, y, z, renderer );
 
-		rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(), is.getIconIndex(),
-				CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
+		rh.setTexture( CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.BlockP2PTunnel2.getIcon(),
+				is.getIconIndex(), CableBusTextures.PartMonitorSides.getIcon(), CableBusTextures.PartMonitorSides.getIcon() );
 
 		rh.setBounds( 2, 2, 14, 14, 14, 16 );
 		rh.renderBlock( x, y, z, renderer );