Minor fix for batch operations