fixed native extraction issues