diff --git a/mvcc/kv_test.go b/mvcc/kv_test.go
index b5dbc2f8f..721d70a57 100644
--- a/mvcc/kv_test.go
+++ b/mvcc/kv_test.go
@@ -245,6 +245,9 @@ func testKVRangeLimit(t *testing.T, f rangeFunc) {
 		if r.Rev != wrev {
 			t.Errorf("#%d: rev = %d, want %d", i, r.Rev, wrev)
 		}
+		if r.Count != len(kvs) {
+			t.Errorf("#%d: count = %d, want %d", i, r.Count, len(kvs))
+		}
 	}
 }
 
diff --git a/mvcc/kvstore.go b/mvcc/kvstore.go
index d1c71fd7c..ba7ec5b98 100644
--- a/mvcc/kvstore.go
+++ b/mvcc/kvstore.go
@@ -497,7 +497,7 @@ func (s *store) rangeKeys(key, end []byte, limit, rangeRev int64, countOnly bool
 			break
 		}
 	}
-	return kvs, len(kvs), curRev, nil
+	return kvs, len(revpairs), curRev, nil
 }
 
 func (s *store) put(key, value []byte, leaseID lease.LeaseID) {