Fix for removing batches.