Batch ops bug fix