Fix scenario generation from exiting after first batch