diff --git a/pending-requests.go b/pending-requests.go
index 4afefe65..9e2d1200 100644
--- a/pending-requests.go
+++ b/pending-requests.go
@@ -1,34 +1,50 @@
 package torrent
 
+import (
+	rbm "github.com/RoaringBitmap/roaring"
+	roaring "github.com/RoaringBitmap/roaring/BitSliceIndexing"
+)
+
 type pendingRequests struct {
-	m map[RequestIndex]int
+	m *roaring.BSI
 }
 
-func (p pendingRequests) Dec(r RequestIndex) {
-	p.m[r]--
-	n := p.m[r]
-	if n == 0 {
-		delete(p.m, r)
-	}
-	if n < 0 {
-		panic(n)
+func (p *pendingRequests) Dec(r RequestIndex) {
+	_r := uint64(r)
+	prev, _ := p.m.GetValue(_r)
+	if prev <= 0 {
+		panic(prev)
 	}
+	p.m.SetValue(_r, prev-1)
 }
 
-func (p pendingRequests) Inc(r RequestIndex) {
-	p.m[r]++
+func (p *pendingRequests) Inc(r RequestIndex) {
+	_r := uint64(r)
+	prev, _ := p.m.GetValue(_r)
+	p.m.SetValue(_r, prev+1)
 }
 
 func (p *pendingRequests) Init() {
-	p.m = make(map[RequestIndex]int)
+	p.m = roaring.NewDefaultBSI()
+}
+
+var allBits rbm.Bitmap
+
+func init() {
+	allBits.AddRange(0, rbm.MaxRange)
 }
 
 func (p *pendingRequests) AssertEmpty() {
-	if len(p.m) != 0 {
+	if p.m == nil {
 		panic(p.m)
 	}
+	sum, _ := p.m.Sum(&allBits)
+	if sum != 0 {
+		panic(sum)
+	}
 }
 
-func (p pendingRequests) Get(r RequestIndex) int {
-	return p.m[r]
+func (p *pendingRequests) Get(r RequestIndex) int {
+	count, _ := p.m.GetValue(uint64(r))
+	return int(count)
 }
diff --git a/torrent.go b/torrent.go
index d2187a05..33376f6c 100644
--- a/torrent.go
+++ b/torrent.go
@@ -1405,7 +1405,7 @@ func (t *Torrent) deletePeerConn(c *PeerConn) (ret bool) {
 	}
 	torrent.Add("deleted connections", 1)
 	c.deleteAllRequests()
-	if t.numActivePeers() == 0 {
+	if t.numActivePeers() == 0 && t.haveInfo() {
 		t.assertNoPendingRequests()
 	}
 	return