Fix for batch2