Fixed problem with large fetches