change extract tool to avoid errors