diff --git a/library/security/openid/consumer/demo/application.e b/library/security/openid/consumer/demo/application.e
index 542f101a..c92a7146 100644
--- a/library/security/openid/consumer/demo/application.e
+++ b/library/security/openid/consumer/demo/application.e
@@ -7,10 +7,18 @@ class
 	APPLICATION
 
 inherit
-	WSF_URI_TEMPLATE_ROUTED_SERVICE
+
+	WSF_ROUTED_SKELETON_SERVICE
+		undefine
+			requires_proxy
+		end
+	
+	WSF_URI_TEMPLATE_HELPER_FOR_ROUTED_SERVICE
 
 	WSF_SERVICE
 
+	WSF_NO_PROXY_POLICY
+
 create
 	make_and_launch
 
diff --git a/library/server/wsf/router/wsf_routed_service.e b/library/server/wsf/router/wsf_routed_service.e
index 9c112317..7526088a 100644
--- a/library/server/wsf/router/wsf_routed_service.e
+++ b/library/server/wsf/router/wsf_routed_service.e
@@ -50,7 +50,7 @@ feature -- Execution
 			end
 		ensure
 			response_status_is_set: res.status_is_set
-			header_sent: res.header_committed and res.message_committed
+			header_sent: res.header_committed
 		end
 
 	execute_default (req: WSF_REQUEST; res: WSF_RESPONSE)