diff --git a/src/main/java/net/dries007/tfc/client/ClientRegisterEvents.java b/src/main/java/net/dries007/tfc/client/ClientRegisterEvents.java
index efc6a8b9c0..0ad5b1edb6 100644
--- a/src/main/java/net/dries007/tfc/client/ClientRegisterEvents.java
+++ b/src/main/java/net/dries007/tfc/client/ClientRegisterEvents.java
@@ -159,8 +159,19 @@ public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack)
 
         for (ItemBlock item : BlocksTFC.getAllBarrelItemBlocks())
         {
-            ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(item.getRegistryName(), "sealed=false"));
-            ModelLoader.setCustomModelResourceLocation(item, 1, new ModelResourceLocation(item.getRegistryName(), "sealed=true"));
+            ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition()
+            {
+                @Override
+                @Nonnull
+                public ModelResourceLocation getModelLocation(@Nonnull ItemStack stack)
+                {
+                    if (stack.getTagCompound() != null)
+                    {
+                        return new ModelResourceLocation(item.getRegistryName(), "sealed=true");
+                    }
+                    return new ModelResourceLocation(item.getRegistryName(), "sealed=false");
+                }
+            });
         }
 
         // BLOCKS - STATE MAPPERS //
diff --git a/src/main/java/net/dries007/tfc/objects/items/itemblock/ItemBlockBarrel.java b/src/main/java/net/dries007/tfc/objects/items/itemblock/ItemBlockBarrel.java
index 545ae8db57..4c31bf0e95 100644
--- a/src/main/java/net/dries007/tfc/objects/items/itemblock/ItemBlockBarrel.java
+++ b/src/main/java/net/dries007/tfc/objects/items/itemblock/ItemBlockBarrel.java
@@ -95,7 +95,7 @@ else if (state.getBlock() instanceof BlockLiquid)
 
                     nbt.setLong("sealedTick", CalendarTFC.TOTAL_TIME.getTicks());
                     nbt.setLong("sealedCalendarTick", CalendarTFC.CALENDAR_TIME.getTicks());
-                    ItemStack stack = new ItemStack(player.getHeldItem(hand).getItem(), 1, 1);
+                    ItemStack stack = new ItemStack(player.getHeldItem(hand).getItem());
                     stack.setTagCompound(nbt);
                     player.setHeldItem(hand, stack);
                     return EnumActionResult.SUCCESS;
diff --git a/src/main/java/net/dries007/tfc/objects/te/TEBarrel.java b/src/main/java/net/dries007/tfc/objects/te/TEBarrel.java
index d9e96c55c1..187997c1e8 100644
--- a/src/main/java/net/dries007/tfc/objects/te/TEBarrel.java
+++ b/src/main/java/net/dries007/tfc/objects/te/TEBarrel.java
@@ -342,7 +342,7 @@ public void onBreakBlock(World world, BlockPos pos, IBlockState state)
         if (state.getValue(SEALED))
         {
             // Drop the sealed barrel
-            ItemStack stack = new ItemStack(state.getBlock(), 1, 1);
+            ItemStack stack = new ItemStack(state.getBlock());
             stack.setTagCompound(getItemTag());
             InventoryHelper.spawnItemStack(world, pos.getX(), pos.getY(), pos.getZ(), stack);
         }