diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 43fe5dc4d4..70003a05ba 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -6183,7 +6183,7 @@ nfa_regmatch(
 		{
 		    /* If \Z was present, then ignore composing characters.
 		     * When ignoring the base character this always matches. */
-		    if (len == 0 && sta->c != curc)
+		    if (sta->c != curc)
 			result = FAIL;
 		    else
 			result = OK;
diff --git a/src/version.c b/src/version.c
index ce9b89ccf3..6f0f78f0d0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1478,
 /**/
     1477,
 /**/