Fixed issue with batched responses