NPC fix, again...