Fixed npc behavior