Fixed batching support properly