diff --git a/filename.c b/filename.c
index dff20c08..6d29753c 100644
--- a/filename.c
+++ b/filename.c
@@ -477,7 +477,7 @@ bin_file(f)
 	edata = &data[n];
 	for (p = data;  p < edata;  )
 	{
-		if (utf_mode && !is_utf8_well_formed(p, edata-data))
+		if (utf_mode && !is_utf8_well_formed(p, edata-p))
 		{
 			bin_count++;
 			utf_skip_to_lead(&p, edata);
diff --git a/version.c b/version.c
index ef1e4b61..09bfe7b9 100644
--- a/version.c
+++ b/version.c
@@ -950,6 +950,7 @@ v602  3/1/22    Doc changes.
 v603  3/14/22   Fix --header.
 v604  5/14/22   Fix termlib detection; fix non-ASCII input on Windows.
 v605  6/14/22   Update version number.
+v606
 */
 
-char version[] = "605";
+char version[] = "606x";