diff --git a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
index c23ee06d0..8a90b76f8 100644
--- a/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
+++ b/worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncBlock.java
@@ -66,7 +66,8 @@ public class AsyncBlock implements Block {
     }
 
     public int getTypeId() {
-        return (queue.getCachedCombinedId4Data(x, y, z, BlockTypes.AIR.getInternalId()) & BlockTypes.BIT_MASK);
+        int id = (queue.getCachedCombinedId4Data(x, y, z, BlockTypes.AIR.getInternalId()));
+        return BlockTypes.getFromStateId(id).getInternalId();
     }
 
     @Override
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
index a94c2683f..382eda423 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java
@@ -795,7 +795,7 @@ public final class BlockTypes {
      */
 
     public static final int BIT_OFFSET; // Used internally
-    public static final int BIT_MASK; // Used internally
+    protected static final int BIT_MASK; // Used internally
 
     private static final Map<String, BlockType> $REGISTRY = new HashMap<>();