bug fix batch creation