Try to fix fetching errors