Final HTTPD fix