updates in sync with mplexporter