diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockID.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockID.java
index 278e091cb..d72a3ab41 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockID.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockID.java
@@ -37,6 +37,8 @@ public class BlockID {
     public static final int BARRIER = 24;
     public static final int BEACON = 25;
     public static final int BEDROCK = 26;
+    public static final int BEE_NEST= 677;
+    public static final int BEEHIVE = 678; // highest
     public static final int BEETROOTS = 27;
     public static final int BELL = 605;
     public static final int BIRCH_BUTTON = 28;
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java
index cbfb85fbb..90ebb7ecf 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypesCache.java
@@ -179,7 +179,7 @@ public class BlockTypesCache {
             Collection<String> blocks = blockReg.values();
             Map<String, String> blockMap = blocks.stream().collect(Collectors.toMap(item -> item.charAt(item.length() - 1) == ']' ? item.substring(0, item.indexOf('[')) : item, item -> item));
 
-            int size = blockMap.size();
+            int size = blockMap.size() + 1;
             Field[] idFields = BlockID.class.getDeclaredFields();
             for (Field field : idFields) size = Math.max(field.getInt(null) + 1, size);
             BIT_OFFSET = MathMan.log2nlz(size);