diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index adde9d7..a4db3c8 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -967,7 +967,7 @@
 	    }
 	}
 
-	if (p_verbose >= 15 && SOURCING_NAME != NULL)
+	if ((p_verbose >= 15 && SOURCING_NAME != NULL) || p_verbose >= 16)
 	    msg_verbose_cmd(SOURCING_LNUM, cmdline_copy);
 
 	/*
@@ -1691,9 +1691,6 @@
     if ((*cmdlinep)[0] == '#' && (*cmdlinep)[1] == '!')
 	goto doend;
 
-    if (p_verbose >= 16)
-	msg_verbose_cmd(0, *cmdlinep);
-
 /*
  * 1. Skip comment lines and leading white space and colons.
  * 2. Handle command modifiers.