gistfile1.diff

diff --git i/lib/Net/MCollective/Client.pm w/lib/Net/MCollective/Client.pm
index a749e54..db04f30 100644
--- i/lib/Net/MCollective/Client.pm
+++ w/lib/Net/MCollective/Client.pm
@@ -117,7 +117,11 @@ sub discover {
         );
     }
     
-    my @identities = map { $_->senderid } grep { $_->status } @replies;
+    my @identities = map { $_->senderid }
+                    grep { $_->status }
+                    grep { $_->field('senderagent') eq 'discovery' }
+                    grep { $_->field('requestid') eq $req->requestid } @replies;
+
     $self->discovered_hosts(\@identities);
     return @identities;
 }