Fix the export