restore separate check of batch completion