Batch-mode fix.