diff --git a/lib/command.c b/lib/command.c
index c9b261cf2a..6176640bf6 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -2445,8 +2445,11 @@ cmd_complete_command_real (vector vline, struct vty *vty, int *status, int islib
   /* Only one matched */
   if (vector_slot (matchvec, 1) == NULL)
     {
-      match_str = (char **) matchvec->index;
-      vector_only_wrapper_free (matchvec);
+      size_t index_size = matchvec->alloced * sizeof (void *);
+      match_str = XMALLOC (MTYPE_TMP, index_size);
+      memcpy (match_str, matchvec->index, index_size);
+      vector_free (matchvec);
+
       *status = CMD_COMPLETE_FULL_MATCH;
       return match_str;
     }
@@ -2488,8 +2491,11 @@ cmd_complete_command_real (vector vline, struct vty *vty, int *status, int islib
 	      /* Make new matchvec. */
 	      matchvec = vector_init (INIT_MATCHVEC_SIZE);
 	      vector_set (matchvec, lcdstr);
-              match_str = (char **) matchvec->index;
-              vector_only_wrapper_free (matchvec);
+
+              size_t index_size = matchvec->alloced * sizeof (void *);
+              match_str = XMALLOC (MTYPE_TMP, index_size);
+              memcpy (match_str, matchvec->index, index_size);
+              vector_free (matchvec);
 
 	      *status = CMD_COMPLETE_MATCH;
 	      return match_str;
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 51f71a46bb..c32e22dda0 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -832,7 +832,7 @@ command_generator (const char *text, int state)
 	vector_set (vline, NULL);
 
       if (matched)
-        vector_only_index_free (matched);
+        XFREE (MTYPE_TMP, matched);
       matched = cmd_complete_command (vline, vty, &complete_status);
       cmd_free_strvec (vline);
     }