Fix batch split