Fix NPC issue