Fix on export/import