diff --git a/Example2/Echo.cs b/Example2/Echo.cs
index dd780c8d..73552921 100644
--- a/Example2/Echo.cs
+++ b/Example2/Echo.cs
@@ -8,8 +8,12 @@ namespace Example2
   {
     protected override void OnMessage (MessageEventArgs e)
     {
-      var name = Context.QueryString["name"];
-      Send (!name.IsNullOrEmpty () ? String.Format ("\"{0}\" to {1}", e.Data, name) : e.Data);
+      var name = QueryString["name"];
+      var msg = !name.IsNullOrEmpty ()
+                ? String.Format ("\"{0}\" to {1}", e.Data, name)
+                : e.Data;
+
+      Send (msg);
     }
   }
 }