diff --git a/lib/command.c b/lib/command.c
index aee7d06..dbcef5e 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2590,6 +2590,7 @@
   switch (node)
     {
     case BGP_VPNV4_NODE:
+    case BGP_VPNV6_NODE:
     case BGP_IPV4_NODE:
     case BGP_IPV4M_NODE:
     case BGP_IPV6_NODE:
@@ -2957,9 +2958,10 @@
     case VTY_NODE:
       vty->node = CONFIG_NODE;
       break;
-    case BGP_VPNV4_NODE:
     case BGP_IPV4_NODE:
     case BGP_IPV4M_NODE:
+    case BGP_VPNV4_NODE:
+    case BGP_VPNV6_NODE:
     case BGP_IPV6_NODE:
     case BGP_IPV6M_NODE:
       vty->node = BGP_NODE;
@@ -3000,6 +3002,7 @@
     case BABEL_NODE:
     case BGP_NODE:
     case BGP_VPNV4_NODE:
+    case BGP_VPNV6_NODE:
     case BGP_IPV4_NODE:
     case BGP_IPV4M_NODE:
     case BGP_IPV6_NODE: