adjust to new exporter in master