Fixed exporting (hopefully)