Fix batch_fetch