Fix exporting