diff --git a/scheme/httpd/surflets/surflets.scm b/scheme/httpd/surflets/surflets.scm
index a69a6eb..b350f7e 100644
--- a/scheme/httpd/surflets/surflets.scm
+++ b/scheme/httpd/surflets/surflets.scm
@@ -157,9 +157,8 @@
   (call-with-current-continuation
    (lambda (exit)
      (let* ((req (send/suspend (lambda (new-url)
-				 (exit new-url))))
-	    (bindings (form-query (http-url:search (request:url req)))))
-       (function bindings)))))
+				 (exit new-url)))))
+       (function req)))))
 
 
 
diff --git a/scheme/httpd/surflets/web-server/root/surflets/calculate.scm b/scheme/httpd/surflets/web-server/root/surflets/calculate.scm
index 1340c03..c6bef00 100644
--- a/scheme/httpd/surflets/web-server/root/surflets/calculate.scm
+++ b/scheme/httpd/surflets/web-server/root/surflets/calculate.scm
@@ -36,10 +36,10 @@
 
     (define change-operator-callback
       (make-callback 
-       (lambda (bindings)
+       (lambda (req)
 	 (change-operator
 	  (input-field-value operator-input-field
-				  bindings)))))
+				  (get-bindings req))))))
 
     (define (show-page operator-pair)
       (send-html
@@ -47,8 +47,8 @@
 	 (title "Simple calculator")
 	 (body (h1 "Simple calculator")
 	       (servlet-form
-		,(make-callback (lambda (bindings)
-				  (calculate operator-pair bindings)))
+		,(make-callback (lambda (req)
+				  (calculate operator-pair (get-bindings req))))
 		(table
 		 (tr (td "Do calculation:"))
 		 (tr (td ,number-field1)