Fix for the API timeout errors