diff --git a/Tag.cpp b/Tag.cpp
index b7a3d62..b63136d 100644
--- a/Tag.cpp
+++ b/Tag.cpp
@@ -411,7 +411,7 @@ namespace jet {
 	    if(name.find(":") == -1) {
 	       name << ":0";
 	    }
-	    return processModifier(global.cgiVariables[name], modifier);
+	    return processModifier(global.cgiData[name], modifier);
 	 } else	if(variable.ifNext("@")) {
 	    // TODO: should only allow session variables. Allow substitution.
 	 } else if(variable.ifNext("%")) {
diff --git a/__dump.cpp b/__dump.cpp
index fe941a3..45b5862 100644
--- a/__dump.cpp
+++ b/__dump.cpp
@@ -13,8 +13,8 @@ namespace jet {
 
       if(global.cgi) {
 	 outFile << "*** CGI VARIABLES ***" << std::endl;
-	 for (auto i = global.cgiVariables.begin(); i != global.cgiVariables.end(); i++)
-	   outFile << i->first << "=[" << i->second << "]" << std::endl;
+//	 for (auto i = global.cgiVariables.begin(); i != global.cgiVariables.end(); i++)
+//	   outFile << i->first << "=[" << i->second << "]" << std::endl;
       }
       
       outFile << "*** GLOBAL VARIABLES ***" << std::endl;      
diff --git a/__jet.cpp b/__jet.cpp
index 31bf5c4..2f1f665 100644
--- a/__jet.cpp
+++ b/__jet.cpp
@@ -36,7 +36,7 @@ namespace jet {
 	    coreutils::ZString contentLength(getenv("CONTENT_LENGTH"));
 	    coreutils::ZString contentType(getenv("CONTENT_TYPE"));
 	    
-	    formdata = new coreutils::CGIFormData(0, contentType, contentLength, boundary);	      
+	    global.cgiData = new coreutils::CGIFormData(0, contentType, contentLength, boundary);	      
 	 }	
       }
       processContainer(container, NULL, true);