HTTP fix attempt 3