diff --git a/src/scriptfile.c b/src/scriptfile.c
index b93e351..3821591 100644
--- a/src/scriptfile.c
+++ b/src/scriptfile.c
@@ -2012,6 +2012,7 @@
     char_u	*scriptname, *tofree;
     int		ret = FALSE;
     int		i;
+    int		ret_sid;
 
     // If there is no '#' after name[0] there is no package name.
     p = vim_strchr(name, AUTOLOAD_CHAR);
@@ -2039,7 +2040,8 @@
 	}
 
 	// Try loading the package from $VIMRUNTIME/autoload/<name>.vim
-	if (source_runtime(scriptname, 0) == OK)
+	// Use "ret_sid" to avoid loading the same script again.
+	if (source_in_path(p_rtp, scriptname, 0, &ret_sid) == OK)
 	    ret = TRUE;
     }
 
diff --git a/src/testdir/sautest/autoload/sourced.vim b/src/testdir/sautest/autoload/sourced.vim
index f69f00c..aac96b1 100644
--- a/src/testdir/sautest/autoload/sourced.vim
+++ b/src/testdir/sautest/autoload/sourced.vim
@@ -1,3 +1,4 @@
 let g:loaded_sourced_vim += 1
-func! sourced#something()
+func sourced#something()
 endfunc
+call sourced#something()
diff --git a/src/version.c b/src/version.c
index b67d3c3..e97b390 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1398,
+/**/
     1397,
 /**/
     1396,