diff --git a/samples/forward.lua b/samples/forward.lua
index fe0d20a..0f79ee2 100644
--- a/samples/forward.lua
+++ b/samples/forward.lua
@@ -162,7 +162,10 @@ print("starting to foward", who)
             elseif snd_err ~= "timeout" then return kick(who) end
         end
         -- if we are done receiving, we are done
-        if not rec_err then return kick(who) end
+        if not rec_err then 
+            kick(who) 
+            kick(peer)
+        end
     end
 end
 
diff --git a/test/httptest.lua b/test/httptest.lua
index 8862ceb..2335fcb 100644
--- a/test/httptest.lua
+++ b/test/httptest.lua
@@ -23,7 +23,7 @@ http.TIMEOUT = 10
 local t = socket.gettime()
 
 host = host or "diego.student.princeton.edu"
-proxy = proxy or "http://dell-diego:3128"
+proxy = proxy or "http://localhost:3128"
 prefix = prefix or "/luasocket-test"
 cgiprefix = cgiprefix or "/luasocket-test-cgi"
 index_file = "test/index.html"