diff --git a/TODO b/TODO
index d6733395..64a0628d 100644
--- a/TODO
+++ b/TODO
@@ -1,13 +1,10 @@
 Core
 ~~~~
-- config: try to unify expressions
-
-- static: check validity of route destination?
-
 - configure: default CFLAGS?
 
 - filters: deletion of mandatory attributes?
 - filters: user defined attributes?
+- filters: arithmetics and define'd symbols
 
 - kernel: persistent mode
 
@@ -22,7 +19,6 @@ Core
 
 - bgp: timing of updates?
 - bgp: dump and get_route_info
-- bgp: when protocol is down, don't print Idle state
 
 - proto: Don't show repeated `Changed state to ...' messages if only internal states change
 
diff --git a/proto/bgp/bgp.c b/proto/bgp/bgp.c
index 98eb003e..c6dc4e90 100644
--- a/proto/bgp/bgp.c
+++ b/proto/bgp/bgp.c
@@ -503,7 +503,10 @@ bgp_get_status(struct proto *P, byte *buf)
 {
   struct bgp_proto *p = (struct bgp_proto *) P;
 
-  strcpy(buf, bgp_state_names[MAX(p->incoming_conn.state, p->outgoing_conn.state)]);
+  if (P->proto_state == PS_DOWN)
+    buf[0] = 0;
+  else
+    strcpy(buf, bgp_state_names[MAX(p->incoming_conn.state, p->outgoing_conn.state)]);
 }
 
 static int