diff --git a/src/fileio.c b/src/fileio.c
index 251d155..46fdea9 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1380,6 +1380,8 @@
 # endif
 			   )
 			{
+			    if (can_retry)
+				goto rewind_retry;
 			    if (conv_error == 0)
 				conv_error = curbuf->b_ml.ml_line_count
 								- linecnt + 1;
diff --git a/src/version.c b/src/version.c
index adab0a8..fef8b9b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    915,
+/**/
     914,
 /**/
     913,