Fixed export for real this time