Fixed batch-mode (and with --output)