diff --git a/_examples/qperf/qperf.go b/_examples/qperf/qperf.go
index 7f9b5703..2c1ad6c6 100644
--- a/_examples/qperf/qperf.go
+++ b/_examples/qperf/qperf.go
@@ -18,6 +18,7 @@ func main() {
 	tcp := flag.Bool("tcp", false, "TCP mode")
 	nsid := flag.Bool("nsid", false, "ask for NSID")
 	queries := flag.Int("queries", 20, "number of concurrent queries to perform")
+	maxproc := flag.Int("maxproc", 4, "set GOMAXPROCS to this value")
         looptime := flag.Int("time", 2, "number of seconds to query")
         cpuprofile := flag.String("cpuprofile", "", "write cpu profile to file")
 	flag.Usage = func() {
@@ -41,7 +42,7 @@ func main() {
                 pprof.StartCPUProfile(f)
                 defer pprof.StopCPUProfile()
         }
-        runtime.GOMAXPROCS(*queries)
+        runtime.GOMAXPROCS(*maxproc)
 
 Flags:
 	for i := 0; i < flag.NArg(); i++ {
@@ -94,6 +95,7 @@ Flags:
         for i := 0; i < *queries; i++ {
                 go func() {
                         println("starting querier")
+                        pktbuf := make([]byte, dns.DefaultMsgSize)
                         c := dns.NewClient()
                         if *tcp {
                                 c.Net = "tcp"
@@ -117,9 +119,11 @@ Flags:
                         for {
                                 // set Id
                                 mbuf[0], mbuf[1] = byte(qid >> 8), byte(qid)
-                                c.ExchangeBuffer(mbuf, nameserver)
+                                if ok := c.ExchangeBuffer(mbuf, nameserver, pktbuf); !ok {
+                                        println("weird reply", qid)
+                                }
                                 queries_send++  // global var...???
-                                qid++   // let is overflow and wrap
+                                qid++   // let it overflow and wrap
                                 /*
                                 if r == nil {
                                         println("weird reply", qid)
diff --git a/client.go b/client.go
index af6e0492..c781b94f 100644
--- a/client.go
+++ b/client.go
@@ -191,26 +191,24 @@ func (c *Client) Do(m *Msg, a string) {
 
 // ExchangeBuf performs a synchronous query. It sends the buffer m to the
 // address (net.Addr?) contained in a
-func (c *Client) ExchangeBuffer(m []byte, a string) []byte {
+func (c *Client) ExchangeBuffer(inbuf []byte, a string, outbuf []byte) bool {
 	w := new(reply)
 	w.client = c
 	w.addr = a
-	_, err := w.writeClient(m)
+	_, err := w.writeClient(inbuf)
 	defer w.closeClient() // XXX here?? what about TCP which should remain open
 	if err != nil {
 		println(err.String())
-		return nil
+		return false
 	}
 
 	// udp / tcp TODO
-	p := make([]byte, DefaultMsgSize)
-	n, err := w.readClient(p)
+	n, err := w.readClient(outbuf)
 	if err != nil {
-		return nil
+		return false
 	}
-	p = p[:n]
-        return p
-
+	outbuf = outbuf[:n]
+        return true
 }
 
 // Exchange performs an synchronous query. It sends the message m to the address
@@ -220,12 +218,12 @@ func (c *Client) Exchange(m *Msg, a string) *Msg {
 	if !ok {
 		panic("failed to pack message")
 	}
-        p := c.ExchangeBuffer(out, a)
-        if p == nil {
+        in := make([]byte, DefaultMsgSize)
+        if ok := c.ExchangeBuffer(out, a, in); !ok {
                 return nil
         }
 	r := new(Msg)
-	if ok := r.Unpack(p); !ok {
+	if ok := r.Unpack(in); !ok {
 		return nil
 	}
         return r