diff --git a/library/server/wsf/src/wsf_request.e b/library/server/wsf/src/wsf_request.e
index 6dc729c7..3348b97f 100644
--- a/library/server/wsf/src/wsf_request.e
+++ b/library/server/wsf/src/wsf_request.e
@@ -841,6 +841,8 @@ feature -- Access: CGI meta parameters - 1.1
 				pi := path_info
 				if pi.is_empty then
 					l_result := ""
+				elseif pi.count = 1 and then pi[1] = '/' then
+					l_result := "/"					
 				else
 					r := request_uri
 					i := r.index_of ('?', 1)