diff --git a/src/FNPC/npc/NPC.php b/src/FNPC/npc/NPC.php
index 8d56552..1349280 100644
--- a/src/FNPC/npc/NPC.php
+++ b/src/FNPC/npc/NPC.php
@@ -484,24 +484,14 @@ public function spawnTo($player,$level=false)
 		$pk->yaw=$this->yaw;
 		$pk->pitch=$this->pitch;
 		$pk->item=$this->handItem;
+		$flags = 0;
+		$flags |= 1 << Entity::DATA_FLAG_CAN_SHOW_NAMETAG;
+		$flags |= 1 << Entity::DATA_FLAG_ALWAYS_SHOW_NAMETAG;
 		$pk->metadata=array(
-			Entity::DATA_FLAGS=>[Entity::DATA_TYPE_BYTE,0],
-			Entity::DATA_AIR=>[Entity::DATA_TYPE_SHORT,300],
+			Entity::DATA_FLAGS=>[Entity::DATA_TYPE_BYTE,$flags],
 			Entity::DATA_NAMETAG=>[Entity::DATA_TYPE_STRING,$this->nametag],
-			Entity::DATA_SHOW_NAMETAG=>[Entity::DATA_TYPE_BYTE,1],
-			Entity::DATA_SILENT=>[Entity::DATA_TYPE_BYTE,0],
-			Entity::DATA_NO_AI=>[Entity::DATA_TYPE_BYTE,1]);
-		if(\pocketmine\API_VERSION=='2.0.0')
-		{
-			$pk->metadata[Entity::DATA_LEAD_HOLDER]=[Entity::DATA_TYPE_LONG,-1];
-			$pk->metadata[Entity::DATA_LEAD]=[Entity::DATA_TYPE_BYTE,0];
-			$pk1=new \pocketmine\network\protocol\SetEntityLinkPacket();
-			$pk1->from=$this->getId();
-			$pk1->to=0;
-			$pk1->type=3;
-			$player->dataPacket($pk1);
-			unset($pk1);
-		}
+			Entity::DATA_LEAD_HOLDER_EID => [Entity::DATA_TYPE_LONG, -1]
+		);
 		$player->dataPacket($pk);
 		Server::getInstance()->updatePlayerListData($this->uuid,$this->getEID(),$this->nametag,$this->skinName,$this->skin,array($player));
 		unset($player,$pk,$level);