Fix broken batching...