Fixed export issue