Fixed the npc issue