Fix for HTTP