Fixed exporting