Fix batch processing