diff --git a/src/main/java/com/sk89q/worldedit/blocks/BlockData.java b/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
index f207e13af..939d337a5 100644
--- a/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
+++ b/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
@@ -173,13 +173,13 @@ public final class BlockData {
 
         case BlockID.PISTON_BASE:
         case BlockID.PISTON_STICKY_BASE:
-        case BlockID.PISTON_EXTENSION:
+        case BlockID.PISTON_EXTENSION:
             final int rest = data & ~0x7;
-            switch (data & 0x7) {
-            case 2: return 5 | rest;
-            case 3: return 4 | rest;
-            case 4: return 2 | rest;
-            case 5: return 3 | rest;
+            switch (data & 0x7) {
+            case 2: return 5 | rest;
+            case 3: return 4 | rest;
+            case 4: return 2 | rest;
+            case 5: return 3 | rest;
             }
             break;
 
@@ -398,11 +398,11 @@ public final class BlockData {
 
         switch (direction) {
         case NORTH_SOUTH:
-            flipX = 1;
+            flipZ = 1;
             break;
 
         case WEST_EAST:
-            flipZ = 1;
+            flipX = 1;
             break;
 
         case UP_DOWN: