Adjustment to export/import bug