diff --git a/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java b/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
index 5c445892f..66327d9a1 100644
--- a/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
+++ b/src/main/java/com/sk89q/worldedit/bukkit/DefaultNmsBlock.java
@@ -253,14 +253,12 @@ public class DefaultNmsBlock extends NmsBlock {
 //        TileEntity te = craftWorld.getHandle().getTileEntity(x, y, z);
 //        craftWorld.getHandle().tileEntityList.remove(te);
 
-        boolean changed = craftWorld.getHandle().setRawTypeId(x, y, z, block.getId());
+        boolean changed = craftWorld.getHandle().setTypeIdAndData(x, y, z, block.getId(), block.getData(), 0);
 
         if (block instanceof BaseBlock) {
             world.copyToWorld(position, (BaseBlock) block);
         }
 
-        changed = craftWorld.getHandle().setData(x, y, z, block.getData(), 2) || changed;
-
         if (changed) {
             if (notifyAdjacent) {
                 craftWorld.getHandle().update(x, y, z, block.getId());