diff --git a/src/fileio.c b/src/fileio.c
index f2d2040..b9221ed 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -9009,6 +9009,9 @@
 
 	    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 5025c68..521f2d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    436,
+/**/
     435,
 /**/
     434,