diff --git a/library/server/ewsgi/connectors/nino/nino-safe.ecf b/library/server/ewsgi/connectors/nino/nino-safe.ecf
index 8eed8f34..b27dd0b2 100644
--- a/library/server/ewsgi/connectors/nino/nino-safe.ecf
+++ b/library/server/ewsgi/connectors/nino/nino-safe.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
+		<library name="encoder" location="../../../../text/encoder/encoder-safe.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi-safe.ecf" readonly="false"/>
 		<library name="http" location="../../../../network/protocol/http/http-safe.ecf"/>
 		<library name="nino" location="../../../../../contrib/library/network/server/nino/nino-safe.ecf" readonly="false">
diff --git a/library/server/ewsgi/connectors/nino/nino.ecf b/library/server/ewsgi/connectors/nino/nino.ecf
index e861cba1..98287438 100644
--- a/library/server/ewsgi/connectors/nino/nino.ecf
+++ b/library/server/ewsgi/connectors/nino/nino.ecf
@@ -10,6 +10,7 @@
 		<option warning="true" full_class_checking="true">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base.ecf"/>
+		<library name="encoder" location="../../../../text/encoder/encoder.ecf"/>
 		<library name="ewsgi" location="..\..\ewsgi.ecf" readonly="false"/>
 		<library name="http" location="../../../../network/protocol/http/http.ecf"/>
 		<library name="nino" location="../../../../../contrib/library/network/server/nino/nino.ecf" readonly="false">
diff --git a/library/server/ewsgi/connectors/nino/src/wgi_nino_handler.e b/library/server/ewsgi/connectors/nino/src/wgi_nino_handler.e
index c9890a27..314c4c57 100644
--- a/library/server/ewsgi/connectors/nino/src/wgi_nino_handler.e
+++ b/library/server/ewsgi/connectors/nino/src/wgi_nino_handler.e
@@ -69,16 +69,18 @@ feature -- Request processing
 			vn: STRING
 
 			e: EXECUTION_ENVIRONMENT
+			enc: URL_ENCODER
 		do
 			l_request_uri := a_handler.uri
 			l_headers_map := a_handler.request_header_map
 			create e
-			if attached e.starting_environment_variables as vars then
+			if attached e.starting_environment as vars then
+				create enc
 				create env.make_equal (vars.count)
 				across
 					vars as c
 				loop
-					env.force (c.item.to_string_8, c.key)
+					env.force (enc.encoded_string (c.item), enc.encoded_string (c.key))
 				end
 			else
 				create env.make (0)