diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index 03d8afb96d..991afb14e3 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -287,6 +287,8 @@ public class CraftBlock implements Block {
         case SKULL:
             return new CraftSkull(this);
         case COMMAND:
+        case COMMAND_CHAIN:
+        case COMMAND_REPEATING:
             return new CraftCommandBlock(this);
         case BEACON:
             return new CraftBeacon(this);