diff --git a/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java b/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java
index 43b6f4ba..db068864 100644
--- a/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java
+++ b/src/main/java/com/cricketcraft/chisel/inventory/ContainerPresent.java
@@ -1,18 +1,17 @@
 package com.cricketcraft.chisel.inventory;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.ContainerChest;
+import net.minecraft.inventory.Container;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
-public class ContainerPresent extends ContainerChest {
+public class ContainerPresent extends Container {
 
 	private IInventory lower;
 	private int rows;
 
 	public ContainerPresent(IInventory player, IInventory chest) {
-		super(player, chest);
 		lower = chest;
 		rows = chest.getSizeInventory() / 9;
 		chest.openInventory();
@@ -52,7 +51,7 @@ public class ContainerPresent extends ContainerChest {
 
 			if (p_82846_2_ < rows * 9)
 			{
-				if (!this.mergeItemStack(itemstack1, rows * 9, rows * 9 + 36, true))
+				if (!this.mergeItemStack(itemstack1, rows * 9, inventorySlots.size(), true))
 				{
 					return null;
 				}
@@ -74,4 +73,9 @@ public class ContainerPresent extends ContainerChest {
 
 		return itemstack;
 	}
+
+	@Override
+	public boolean canInteractWith(EntityPlayer p_75145_1_) {
+		return true;
+	}
 }
diff --git a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java
index 96c39d7f..ff6a2259 100644
--- a/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java
+++ b/src/main/java/com/cricketcraft/chisel/item/chisel/ChiselMode.java
@@ -102,7 +102,7 @@ public enum ChiselMode implements IChiselMode {
 		}
 
 		if (held != null && held.getItem() instanceof IChiselItem) {
-			if (origBlock == block) {
+			if (origBlock == v.getBlock()) {
 				world.setBlockMetadataWithNotify(x, y, z, v.getBlockMeta(), 3);
 			} else {
 				world.setBlock(x, y, z, v.getBlock(), v.getBlockMeta(), 3);