diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php
index 89f0d5844..9d2a06393 100644
--- a/src/pocketmine/Player.php
+++ b/src/pocketmine/Player.php
@@ -1360,7 +1360,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 						Block::$creative[$packet->slot][1],
 						1
 					);
-					$this->inventory->setHeldItemSlot(0);
 					$this->inventory->setItemInHand($item);
 				}else{
 					$this->inventory->setHeldItemSlot($packet->slot);
@@ -1891,6 +1890,7 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{
 					if($packet->slot > $this->inventory->getSize()){
 						break;
 					}
+					$this->inventory->setHeldItemSlot($packet->slot);
 					$transaction = new BaseTransaction($this->inventory, $packet->slot, $this->inventory->getItem($packet->slot), $packet->item);
 				}elseif(isset($this->windowIndex[$packet->windowid])){
 					$this->craftingType = 0;
@@ -2395,4 +2395,4 @@ if(is_numeric($data["cause"])){
 	}
 }
 Player::broadcastMessage($data["player"]->getName() . $message);
-*/
+*/
\ No newline at end of file