Fix for import/export.