diff --git a/HttpServer/Events/OnClose.php b/HttpServer/Events/OnClose.php
index 3747fd71..745e0124 100644
--- a/HttpServer/Events/OnClose.php
+++ b/HttpServer/Events/OnClose.php
@@ -49,7 +49,10 @@ class OnClose extends Callback
 			if (!($server instanceof WServer) || !$server->isEstablished($fd)) {
 				return;
 			}
-			$node = $router->search('/' . Socket::CLOSE . '::event', 'sw::socket');
+
+			$node = $router->tree_search(explode('/', Socket::CLOSE . '::event'), 'sw::socket');
+
+//			$node = $router->search('/' . Socket::CLOSE . '::event', 'sw::socket');
 			if ($node instanceof Node) {
 				$node->dispatch($server, $fd);
 			}
diff --git a/HttpServer/Events/OnHandshake.php b/HttpServer/Events/OnHandshake.php
index 3a9b8d88..22b98485 100644
--- a/HttpServer/Events/OnHandshake.php
+++ b/HttpServer/Events/OnHandshake.php
@@ -106,7 +106,9 @@ class OnHandshake extends Callback
 				return $this->connect($response, 101);
 			}
 			$router = Snowflake::app()->getRouter();
-			$node = $router->search('/' . Socket::HANDSHAKE . '::event', 'sw::socket');
+
+			$node = $router->tree_search(explode('/', Socket::HANDSHAKE . '::event'), 'sw::socket');
+//			$node = $router->search('/' . Socket::HANDSHAKE . '::event', 'sw::socket');
 			if ($node === null) {
 				return $this->disconnect($response, 502);
 			}