diff --git a/TODO b/TODO
index b9026c4f..7eb9bed7 100644
--- a/TODO
+++ b/TODO
@@ -24,9 +24,8 @@ Core
 
 - bgp: timing of updates?
 - bgp: dump and get_route_info
-- bgp: packet size limit in sending of withdrawals?
 
-- proto: `Changed state to ...' message -> show internal states
+- proto: Don't show repeated `Changed state to ...' messages if only internal states change
 
 Documentation
 ~~~~~~~~~~~~~
diff --git a/proto/bgp/packets.c b/proto/bgp/packets.c
index 88d960d8..7a866fca 100644
--- a/proto/bgp/packets.c
+++ b/proto/bgp/packets.c
@@ -62,6 +62,7 @@ bgp_encode_prefixes(struct bgp_proto *p, byte *w, struct bgp_bucket *buck, unsig
       ipa_hton(a);
       memcpy(w, &a, bytes);
       w += bytes;
+      remains -= bytes;
       rem_node(&px->bucket_node);
       fib_delete(&p->prefix_fib, px);
     }