diff --git a/gradle.properties b/gradle.properties
index ea2e41c..3c1a501 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ yarn_mappings=1.20.2+build.4
 loader_version=0.14.24
 
 # Mod Properties
-mod_version=1.5+1.20.2
+mod_version=1.6+1.20.2
 maven_group=re.domi
 archives_base_name=fast-chest
 
diff --git a/src/main/java/re/domi/fastchest/mixin/BlockEntityRenderDispatcherMixin.java b/src/main/java/re/domi/fastchest/mixin/BlockEntityRenderDispatcherMixin.java
index bf1138d..36fa992 100644
--- a/src/main/java/re/domi/fastchest/mixin/BlockEntityRenderDispatcherMixin.java
+++ b/src/main/java/re/domi/fastchest/mixin/BlockEntityRenderDispatcherMixin.java
@@ -3,7 +3,6 @@
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.ChestBlockEntity;
 import net.minecraft.block.entity.EnderChestBlockEntity;
-import net.minecraft.block.entity.TrappedChestBlockEntity;
 import net.minecraft.client.render.block.entity.BlockEntityRenderDispatcher;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -20,12 +19,7 @@ private <E extends BlockEntity> void removeBlockEntityRenderer(E blockEntity, Ca
     {
         if (Config.simplifiedChest)
         {
-            Class<?> beClass = blockEntity.getClass();
-
-            if (beClass == ChestBlockEntity.class ||
-                beClass == TrappedChestBlockEntity.class ||
-                beClass == EnderChestBlockEntity.class ||
-                beClass.getSuperclass().getName().equals("io.github.cyberanner.ironchests.blocks.blockentities.GenericChestEntity"))
+            if (blockEntity instanceof ChestBlockEntity || blockEntity instanceof EnderChestBlockEntity)
             {
                 cir.setReturnValue(null);
             }