diff --git a/.travis.yml b/.travis.yml
index 1597c6da6c6..0fbac3cca40 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ env:
     - IPFS_REUSEPORT=false
 
 go:
-    - 1.7
+    - 1.8
 
 install: true
 
diff --git a/routing.go b/routing.go
index 956f7c1c2a1..93ba29ea5f9 100644
--- a/routing.go
+++ b/routing.go
@@ -444,7 +444,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (pstore.PeerInfo,
 		closer := pmes.GetCloserPeers()
 		clpeerInfos := pb.PBPeersToPeerInfos(closer)
 
-		// see it we got the peer here
+		// see if we got the peer here
 		for _, npi := range clpeerInfos {
 			if npi.ID == id {
 				return &dhtQueryResult{
@@ -456,6 +456,7 @@ func (dht *IpfsDHT) FindPeer(ctx context.Context, id peer.ID) (pstore.PeerInfo,
 
 		notif.PublishQueryEvent(parent, &notif.QueryEvent{
 			Type:      notif.PeerResponse,
+			ID:        p,
 			Responses: clpeerInfos,
 		})