diff --git a/src/Player.php b/src/Player.php
index a08bcff39..feb60affc 100644
--- a/src/Player.php
+++ b/src/Player.php
@@ -472,7 +472,7 @@ class Player{
 						if($w === $data["tile"]){
 							$this->dataPacket(MC_CONTAINER_SET_SLOT, array(
 								"windowid" => $id,
-								"slot" => $data["slot"],
+								"slot" => $data["slot"] + (isset($data["offset"]) ? $data["offset"]:0),
 								"block" => $data["slotdata"]->getID(),
 								"stack" => $data["slotdata"]->count,
 								"meta" => $data["slotdata"]->getMetadata(),
@@ -1758,6 +1758,7 @@ class Player{
 					if($this->server->api->dhandle("player.container.slot", array(
 						"tile" => $tile,
 						"slot" => $data["slot"],
+						"offset" => $offset,
 						"slotdata" => $slot,
 						"itemdata" => $item,
 						"player" => $this,
diff --git a/src/world/Tile.php b/src/world/Tile.php
index fafb4589c..4e561db3b 100644
--- a/src/world/Tile.php
+++ b/src/world/Tile.php
@@ -117,7 +117,7 @@ class Tile extends Position{
 		}
 		
 		$tile = $this->getPair();
-		unset($this->data["pairx"], $this->data["pairz"], $ile->data["pairx"], $tile->data["pairz"]);
+		unset($this->data["pairx"], $this->data["pairz"], $tile->data["pairx"], $tile->data["pairz"]);
 		
 		$this->server->api->tile->spawnToAll($this);		
 		if($tile instanceof Tile){
@@ -330,7 +330,8 @@ class Tile extends Position{
 		}
 		$this->server->api->dhandle("tile.container.slot", array(
 			"tile" => $this,
-			"slot" => $s + $offset,
+			"slot" => $s,
+			"offset" => $offset,
 			"slotdata" => $item,
 		));