diff --git a/network-query.rkt b/network-query.rkt
index b39169c..5df1d21 100644
--- a/network-query.rkt
+++ b/network-query.rkt
@@ -212,15 +212,16 @@
 (define (make-dns-address ip-address)
   (udp-remote-address (ip->host-name ip-address) 53))
 
-;; network-query : UdpAddress Question DomainName NEListOf<DomainName> UniqueId -> BootK
+;; network-query : UdpAddress Question DomainName NEListOf<DomainName> UniqueId -> Spawn
 (define (network-query s q zone-origin server-names unique-id)
-  (lambda (self-pid)
-    (try-next-server (network-query-state (network-request s q zone-origin server-names unique-id)
-					  first-timeout
-					  (hash)
-					  '()
-					  #f
-					  server-names))))
+  (spawn #:debug-name (list 'network-query q)
+	 #:child
+	 (try-next-server (network-query-state (network-request s q zone-origin server-names unique-id)
+					       first-timeout
+					       (hash)
+					       '()
+					       #f
+					       server-names))))
 
 (define (try-next-server w)
   (match w
diff --git a/proxy.rkt b/proxy.rkt
index c9913ea..e6bd94b 100644
--- a/proxy.rkt
+++ b/proxy.rkt
@@ -242,12 +242,11 @@
 			   q referral-id (domain-labels zone-origin)
 			   (map domain-labels (set-map nameserver-rrs rr-rdata))))
 	(transition w
-	  (spawn #:debug-name (list 'network-query q)
-		 #:child (network-query client-sock
-					q
-					zone-origin
-					(map rr-rdata (set->list nameserver-rrs))
-					referral-id))
+	  (network-query client-sock
+			 q
+			 zone-origin
+			 (map rr-rdata (set->list nameserver-rrs))
+			 referral-id)
 	  (endpoint #:subscriber (network-reply referral-id (wild))
 		    #:name referral-id
 		    #:state w