Fix row reference during multiple items in a batch