Attempting to fix the HTTP timeout bug...