fixed exhaustive ori extract