CXX-175 no empty batches!