Fix for batch run.