Fix/exporters