diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index fe741aa..b9d6e93 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -338,16 +338,13 @@
 {
   struct stream *s = BGP_INPUT (peer);
   u_int16_t restart_flag_time;
-  int restart_bit = 0;
   size_t end = stream_get_getp (s) + caphdr->length;
 
   SET_FLAG (peer->cap, PEER_CAP_RESTART_RCV);
   restart_flag_time = stream_getw(s);
   if (CHECK_FLAG (restart_flag_time, RESTART_R_BIT))
-    {
-      SET_FLAG (peer->cap, PEER_CAP_RESTART_BIT_RCV);
-      restart_bit = 1;
-    }
+    SET_FLAG (peer->cap, PEER_CAP_RESTART_BIT_RCV);
+  
   UNSET_FLAG (restart_flag_time, 0xF000);
   peer->v_gr_restart = restart_flag_time;
 
@@ -355,7 +352,9 @@
     {
       zlog_debug ("%s OPEN has Graceful Restart capability", peer->host);
       zlog_debug ("%s Peer has%srestarted. Restart Time : %d",
-                  peer->host, restart_bit ? " " : " not ",
+                  peer->host,
+                  CHECK_FLAG (peer->cap, PEER_CAP_RESTART_BIT_RCV) ? " " 
+                                                                   : " not ",
                   peer->v_gr_restart);
     }