HTTP fix attempt 2