Fix batch mode hang indefinitely in some scenarios