Fixed export with