diff --git a/src/main/java/com/sk89q/worldedit/blocks/BlockData.java b/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
index add9bd147..3019146e6 100644
--- a/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
+++ b/src/main/java/com/sk89q/worldedit/blocks/BlockData.java
@@ -78,6 +78,10 @@ public final class BlockData {
             case 1: return 3;
             case 2: return 1;
             case 3: return 0;
+            case 4: return 6;
+            case 5: return 7;
+            case 6: return 5;
+            case 7: return 4;
             }
             break;
 
@@ -238,6 +242,10 @@ public final class BlockData {
             case 3: return 1;
             case 1: return 2;
             case 0: return 3;
+            case 6: return 4;
+            case 7: return 5;
+            case 5: return 6;
+            case 4: return 7;
             }
             break;
 
@@ -421,17 +429,25 @@ public final class BlockData {
             }
             break;
 
+        case BlockID.STEP:
+            return data ^ (flipY << 3);
+
         case BlockID.WOODEN_STAIRS:
         case BlockID.COBBLESTONE_STAIRS:
         case BlockID.BRICK_STAIRS:
         case BlockID.STONE_BRICK_STAIRS:
         case BlockID.NETHER_BRICK_STAIRS:
+            data ^= flipY << 2;
             switch (data) {
             case 0:
             case 1:
+            case 4:
+            case 5:
                 return data ^ flipX;
             case 2:
             case 3:
+            case 6:
+            case 7:
                 return data ^ flipZ;
             }
             break;