Major NPC Bug Fixed