fix batch modes