Cdcr fix batchboundaries