diff --git a/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java b/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
index d064b7af6..ce25f5920 100644
--- a/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
+++ b/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
@@ -253,7 +253,7 @@ public static boolean setSafely(BukkitWorld world, Vector position,
 //        TileEntity te = craftWorld.getHandle().getTileEntity(x, y, z);
 //        craftWorld.getHandle().tileEntityList.remove(te);
 
-        boolean changed = craftWorld.getHandle().setTypeIdAndData(x, y, z, block.getId(), 0, 0);
+        boolean changed = craftWorld.getHandle().setTypeIdAndData(x, y, z, block.getId(), block.getData(), 0);
 
         if (block instanceof BaseBlock) {
             world.copyToWorld(position, (BaseBlock) block);
diff --git a/src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151.class b/src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151dv.class
similarity index 76%
rename from src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151.class
rename to src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151dv.class
index 3f8f95c2d..b68088e83 100644
Binary files a/src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151.class and b/src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151dv.class differ
diff --git a/src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151.java b/src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151dv.java
similarity index 93%
rename from src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151.java
rename to src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151dv.java
index fc664a728..364eb9fa5 100644
--- a/src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151.java
+++ b/src/main/resources/nmsblocks/MCPCPlusXNmsBlock_151dv.java
@@ -50,7 +50,7 @@
 /**
  * Remapping tools are broken atm.
  */
-public class MCPCPlusXNmsBlock_151 extends NmsBlock {
+public class MCPCPlusXNmsBlock_151dv extends NmsBlock {
 
     private static final Logger logger = WorldEdit.logger;
     private static Field compoundMapField;
@@ -86,7 +86,7 @@ public static boolean verify() {
      * @param data data value
      * @param tileEntityBlock tile entity block
      */
-    public MCPCPlusXNmsBlock_151(int type, int data, TileEntityBlock tileEntityBlock) {
+    public MCPCPlusXNmsBlock_151dv(int type, int data, TileEntityBlock tileEntityBlock) {
         super(type, data);
 
         nbtData = (NBTTagCompound) fromNative(tileEntityBlock.getNbtData());
@@ -100,7 +100,7 @@ public MCPCPlusXNmsBlock_151(int type, int data, TileEntityBlock tileEntityBlock
      * @param data data value
      * @param nbtData raw NBT data
      */
-    public MCPCPlusXNmsBlock_151(int type, int data, NBTTagCompound nbtData) {
+    public MCPCPlusXNmsBlock_151dv(int type, int data, NBTTagCompound nbtData) {
         super(type, data);
 
         this.nbtData = nbtData;
@@ -164,7 +164,7 @@ public void setNbtData(CompoundTag tag) throws DataException {
      * @param data data value of block
      * @return the block, or null
      */
-    public static MCPCPlusXNmsBlock_151 get(World world, Vector position, int type, int data) {
+    public static MCPCPlusXNmsBlock_151dv get(World world, Vector position, int type, int data) {
         if (!hasTileEntity(type)) {
             return null;
         }
@@ -175,7 +175,7 @@ public static MCPCPlusXNmsBlock_151 get(World world, Vector position, int type,
         if (te != null) {
             NBTTagCompound tag = new NBTTagCompound();
             te.func_70310_b(tag); // Load data
-            return new MCPCPlusXNmsBlock_151(type, data, tag);
+            return new MCPCPlusXNmsBlock_151dv(type, data, tag);
         }
 
         return null;
@@ -195,11 +195,11 @@ public static boolean set(World world, Vector position, BaseBlock block) {
             return false;
         }
 
-        if (block instanceof MCPCPlusXNmsBlock_151) {
-            MCPCPlusXNmsBlock_151 nmsProxyBlock = (MCPCPlusXNmsBlock_151) block;
+        if (block instanceof MCPCPlusXNmsBlock_151dv) {
+            MCPCPlusXNmsBlock_151dv nmsProxyBlock = (MCPCPlusXNmsBlock_151dv) block;
             data = nmsProxyBlock.getNmsData(position);
         } else if (block instanceof TileEntityBlock) {
-            MCPCPlusXNmsBlock_151 nmsProxyBlock = new MCPCPlusXNmsBlock_151(
+            MCPCPlusXNmsBlock_151dv nmsProxyBlock = new MCPCPlusXNmsBlock_151dv(
                     block.getId(), block.getData(), block);
             data = nmsProxyBlock.getNmsData(position);
         }
@@ -237,7 +237,7 @@ public static boolean setSafely(BukkitWorld world, Vector position,
 //        TileEntity te = craftWorld.getHandle().getTileEntity(x, y, z);
 //        craftWorld.getHandle().tileEntityList.remove(te);
 
-        boolean changed = craftWorld.getHandle().func_72832_d(x, y, z, block.getId(), 0, 0);
+        boolean changed = craftWorld.getHandle().func_72832_d(x, y, z, block.getId(), block.getData(), 0);
 
         if (block instanceof BaseBlock) {
             world.copyToWorld(position, (BaseBlock) block);