diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 233ac10..854ff4d 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4604,6 +4604,7 @@
 #ifdef FEAT_EVAL
 		|| (*p == '#'
 		    && in_vim9script()
+		    && !(eap->argt & EX_NOTRLCOM)
 		    && p[1] != '{'
 		    && p > eap->cmd && VIM_ISWHITE(p[-1]))
 #endif
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 676e97c..9f4231a 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -286,5 +286,14 @@
   unlet g:val
 enddef
 
+def Test_map_command()
+  let lines =<< trim END
+      nnoremap <F3> :echo 'hit F3 #'<CR>
+      assert_equal(":echo 'hit F3 #'<CR>", maparg("<F3>", "n"))
+  END
+  CheckDefSuccess(lines)
+  CheckScriptSuccess(['vim9script'] + lines)
+enddef
+
 
 " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker
diff --git a/src/version.c b/src/version.c
index 126d980..c2057b3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1496,
+/**/
     1495,
 /**/
     1494,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 00572e3..025e8cb 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -6251,6 +6251,7 @@
 	    usefilter = TRUE;
 	if ((argt & EX_TRLBAR) && !usefilter)
 	{
+	    eap->argt = argt;
 	    separate_nextcmd(eap);
 	    if (eap->nextcmd != NULL)
 		nextcmd = eap->nextcmd;