diff --git a/src/fileio.c b/src/fileio.c
index f2d204078..b9221ed40 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -9009,6 +9009,9 @@ win_found:
 
 	    curwin = aco->save_curwin;
 	    curbuf = curwin->w_buffer;
+	    /* In case the autocommand move the cursor to a position that that
+	     * not exist in curbuf. */
+	    check_cursor();
 	}
     }
 }
diff --git a/src/version.c b/src/version.c
index 5025c6887..521f2d88c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    436,
 /**/
     435,
 /**/