diff --git a/src/memline.c b/src/memline.c
index a2f0b4f..fb262ac 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -5267,7 +5267,7 @@
 	/* Don't count the last line break if 'noeol' and ('bin' or
 	 * 'nofixeol'). */
 	if ((!buf->b_p_fixeol || buf->b_p_bin) && !buf->b_p_eol
-					   && buf->b_ml.ml_line_count == lnum)
+					   && lnum > buf->b_ml.ml_line_count)
 	    size -= ffdos + 1;
     }
 
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 13db004..848e798 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -682,6 +682,7 @@
 
 func Test_byte2line_line2byte()
   new
+  set endofline
   call setline(1, ['a', 'bc', 'd'])
 
   set fileformat=unix
@@ -702,7 +703,16 @@
   call assert_equal([-1, -1, 1, 4, 8, 11, -1],
   \                 map(range(-1, 5), 'line2byte(v:val)'))
 
-  set fileformat&
+  bw!
+  set noendofline nofixendofline
+  normal a-
+  for ff in ["unix", "mac", "dos"]
+    let &fileformat = ff
+    call assert_equal(1, line2byte(1))
+    call assert_equal(2, line2byte(2))  " line2byte(line("$") + 1) is the buffer size plus one (as per :help line2byte).
+  endfor
+
+  set endofline& fixendofline& fileformat&
   bw!
 endfunc
 
diff --git a/src/version.c b/src/version.c
index 42a81cc..d382ff3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -795,6 +795,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    303,
+/**/
     302,
 /**/
     301,