diff --git a/src/regexp.c b/src/regexp.c
index 1bd1261..61fc14d 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -1824,7 +1824,7 @@
     char_u	*s;
     typval_T	*listarg = argv + argskip;
 
-    if (!fp->uf_varargs && fp->uf_args.ga_len <= argskip)
+    if (!has_varargs(fp) && fp->uf_args.ga_len <= argskip)
 	// called function doesn't take a submatches argument
 	return argskip;
 
diff --git a/src/testdir/test_substitute.vim b/src/testdir/test_substitute.vim
index af450d5..9bbe997 100644
--- a/src/testdir/test_substitute.vim
+++ b/src/testdir/test_substitute.vim
@@ -442,6 +442,9 @@
 func SubReplacerVar(text, ...)
   return a:text .. a:1[0] .. a:text
 endfunc
+def SubReplacerVar9(text: string, ...args: list<list<string>>): string
+  return text .. args[0][0] .. text
+enddef
 func SubReplacer20(t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11, t12, t13, t14, t15, t16, t17, t18, t19, submatches)
   return a:t3 .. a:submatches[0] .. a:t11
 endfunc
@@ -449,6 +452,7 @@
 func Test_substitute_partial()
   call assert_equal('1foo2foo3', substitute('123', '2', function('SubReplacer', ['foo']), 'g'))
   call assert_equal('1foo2foo3', substitute('123', '2', function('SubReplacerVar', ['foo']), 'g'))
+  call assert_equal('1foo2foo3', substitute('123', '2', function('SubReplacerVar9', ['foo']), 'g'))
 
   " 19 arguments plus one is just OK
   let Replacer = function('SubReplacer20', repeat(['foo'], 19))
diff --git a/src/version.c b/src/version.c
index 1adac5a..6644ac4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    480,
+/**/
     479,
 /**/
     478,