Fix NPC making