Fixed for npc
Update