Fix batch export wait