diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
index d3cc78bc..727dfb27 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11.java
@@ -271,6 +271,7 @@ public class BukkitChunk_1_11 extends CharFaweChunk<Chunk, com.boydti.fawe.bukki
                                 String currentId = EntityTypes.a(key);
                                 Class<? extends Entity> clazz = EntityTypes.b.get(key);
                                 entityKeys.put(currentId, clazz);
+                                entityKeys.put(key.a(), clazz);
                             }
                         }
                         Class<? extends Entity> clazz = entityKeys.get(id);
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
index 758bcd52..3c0d3d08 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
@@ -63,11 +63,9 @@ public class BukkitQueue_1_11 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
             fieldBits.setAccessible(true);
             getEntitySlices = net.minecraft.server.v1_11_R1.Chunk.class.getDeclaredMethod("getEntitySlices");
             getEntitySlices.setAccessible(true);
-            if (adapter == null) {
-                setupAdapter(new com.boydti.fawe.bukkit.v1_11.FaweAdapter_1_11());
-                Fawe.debug("Using adapter: " + adapter);
-                Fawe.debug("=========================================");
-            }
+            setupAdapter(new com.boydti.fawe.bukkit.v1_11.FaweAdapter_1_11());
+            Fawe.debug("Using adapter: " + adapter);
+            Fawe.debug("=========================================");
             for (int i = 0; i < Character.MAX_VALUE; i++) {
                 try {
                     IBD_CACHE[i] = Block.getById(i >> 4).fromLegacyData(i & 0xF);