Fixed export variables