Fix for export disabled