diff --git a/jvm/src/test/scala/org/scalacheck/GenSpecification.scala b/jvm/src/test/scala/org/scalacheck/GenSpecification.scala
index 62caa49b7f..39dc92e0ce 100644
--- a/jvm/src/test/scala/org/scalacheck/GenSpecification.scala
+++ b/jvm/src/test/scala/org/scalacheck/GenSpecification.scala
@@ -200,6 +200,18 @@ object GenSpecification extends Properties("Gen") {
     }
   }
 
+  property("distributed pick") = {
+    val lst = (0 to 7).toIterable
+    val n = 2
+    forAll(pick(n, lst)) { xs: Seq[Int] =>
+      xs.map { x: Int =>
+        Prop.collect(x) {
+          xs.size == n
+        }
+      } reduce (_ && _)
+    }
+  }
+
   property("numChar") = forAll(numChar)(_.isDigit)
 
   property("calendar") = forAll(calendar) { cal =>
diff --git a/src/main/scala/org/scalacheck/Gen.scala b/src/main/scala/org/scalacheck/Gen.scala
index eb3b2caa75..2afc0990bc 100644
--- a/src/main/scala/org/scalacheck/Gen.scala
+++ b/src/main/scala/org/scalacheck/Gen.scala
@@ -681,7 +681,7 @@ object Gen extends GenArities{
           buf += t
         } else {
           val (x, s) = seed.long
-          val i = (x & 0x7fffffff).toInt % n
+          val i = (x & 0x7fffffff).toInt % count
           if (i < n) buf(i) = t
           seed = s
         }