Extract issues fixed