Fix data-loss with --batch.