Fixing CGI, try 2