diff --git a/examples/filter/src/filter_server.e b/examples/filter/src/filter_server.e
index 7368581d..9061e1f1 100644
--- a/examples/filter/src/filter_server.e
+++ b/examples/filter/src/filter_server.e
@@ -71,7 +71,7 @@ feature {NONE} -- Initialization
 			create l_methods
 			l_methods.enable_options
 			l_methods.enable_get
-			router.handle_with_request_methods ("/user/{userid}", l_options_filter, l_methods)
+			router.handle_with_request_methods ("/user/{userid}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent l_options_filter.execute), l_methods)
 			create l_routing_filter.make (router)
 			l_routing_filter.set_execute_default_action (agent execute_default)
 			filter.set_next (l_routing_filter)
diff --git a/library/server/wsf/router/filter/wsf_cors_options_filter.e b/library/server/wsf/router/filter/wsf_cors_options_filter.e
index 7ca0bd87..9b2ad468 100644
--- a/library/server/wsf/router/filter/wsf_cors_options_filter.e
+++ b/library/server/wsf/router/filter/wsf_cors_options_filter.e
@@ -11,8 +11,6 @@ class
 inherit
 	WSF_FILTER
 
-	WSF_URI_TEMPLATE_HANDLER
-
 create
 	make