Fix path cycle -> add npc