diff --git a/common/buildcraft/core/ItemWrench.java b/common/buildcraft/core/ItemWrench.java
index 8dace6f9..a796367f 100644
--- a/common/buildcraft/core/ItemWrench.java
+++ b/common/buildcraft/core/ItemWrench.java
@@ -31,6 +31,7 @@ public class ItemWrench extends ItemBuildCraft implements IToolWrench {
 
 	@Override
 	public void wrenchUsed(EntityPlayer player, int x, int y, int z) {
+		player.swingItem();
 	}
 
 	@Override
diff --git a/common/buildcraft/core/utils/EnumColor.java b/common/buildcraft/core/utils/EnumColor.java
index e13a438f..dcbc39a8 100644
--- a/common/buildcraft/core/utils/EnumColor.java
+++ b/common/buildcraft/core/utils/EnumColor.java
@@ -136,6 +136,11 @@ public enum EnumColor {
 		return next;
 	}
 
+	public EnumColor getPrevious() {
+		EnumColor previous = VALUES[(ordinal() + VALUES.length - 2) % (VALUES.length - 1)];
+		return previous;
+	}
+
 	public EnumColor inverse() {
 		return EnumColor.VALUES[15 - ordinal()];
 	}
diff --git a/common/buildcraft/transport/pipes/PipeItemsLapis.java b/common/buildcraft/transport/pipes/PipeItemsLapis.java
index 5d1872b7..24ceb56c 100644
--- a/common/buildcraft/transport/pipes/PipeItemsLapis.java
+++ b/common/buildcraft/transport/pipes/PipeItemsLapis.java
@@ -54,16 +54,16 @@ public class PipeItemsLapis extends Pipe<PipeTransportItems> implements IItemTra
 	}
 
 	@Override
-	public boolean blockActivated(EntityPlayer entityplayer) {
-		Item equipped = entityplayer.getCurrentEquippedItem() != null ? entityplayer.getCurrentEquippedItem().getItem() : null;
-		if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(entityplayer, container.xCoord, container.yCoord, container.zCoord)) {
-			if (entityplayer.isSneaking()) {
-				setColor(getColor().fromId(container.getBlockMetadata() - 1));
+	public boolean blockActivated(EntityPlayer player) {
+		Item equipped = player.getCurrentEquippedItem() != null ? player.getCurrentEquippedItem().getItem() : null;
+		if (equipped instanceof IToolWrench && ((IToolWrench) equipped).canWrench(player, container.xCoord, container.yCoord, container.zCoord)) {
+			if (player.isSneaking()) {
+				setColor(getColor().getPrevious());
 			} else {
 				setColor(getColor().getNext());
 			}
 
-			((IToolWrench) equipped).wrenchUsed(entityplayer, container.xCoord, container.yCoord, container.zCoord);
+			((IToolWrench) equipped).wrenchUsed(player, container.xCoord, container.yCoord, container.zCoord);
 			return true;
 		}