Fix Problem with Batch Fetch