diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index c7c6598..9310008 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3294,7 +3294,7 @@
 		     * (no preceding character). */
 		    len += mb_char2len(mc);
 		}
-		if (ireg_icombine)
+		if (ireg_icombine && len == 0)
 		{
 		    /* If \Z was present, then ignore composing characters.
 		     * When ignoring the base character this always matches. */
diff --git a/src/testdir/test95.in b/src/testdir/test95.in
index 0f67879..111d877 100644
--- a/src/testdir/test95.in
+++ b/src/testdir/test95.in
@@ -62,10 +62,12 @@
 :call add(tl, [2, "ק\u200d\u05b9x\\Z", "xק\u200dxy", "ק\u200dx"])
 :call add(tl, [2, "ק\u200dx\\Z", "xק\u200d\u05b9xy", "ק\u200d\u05b9x"])
 :call add(tl, [2, "ק\u200dx\\Z", "xק\u200dxy", "ק\u200dx"])
-:"call add(tl, [2, "\u05b9\\Z", "xyz"])
-:"call add(tl, [2, "\\Z\u05b9", "xyz"])
-:"call add(tl, [2, "\u05b9\\+\\Z", "xyz", "xyz"])
-:"call add(tl, [2, "\\Z\u05b9\\+", "xyz", "xyz"])
+:call add(tl, [2, "\u05b9\\Z", "xyz"])
+:call add(tl, [2, "\\Z\u05b9", "xyz"])
+:call add(tl, [2, "\u05b9\\Z", "xy\u05b9z", "y\u05b9"])
+:call add(tl, [2, "\\Z\u05b9", "xy\u05b9z", "y\u05b9"])
+:call add(tl, [1, "\u05b9\\+\\Z", "xy\u05b9z\u05b9 ", "y\u05b9z\u05b9"])
+:call add(tl, [1, "\\Z\u05b9\\+", "xy\u05b9z\u05b9 ", "y\u05b9z\u05b9"])
 
 :"""" Combining different tests and features
 :call add(tl, [2, '[^[=a=]]\+', 'ddaãâbcd', 'dd'])
diff --git a/src/testdir/test95.ok b/src/testdir/test95.ok
index 3fafb8f..b9cdd2e 100644
--- a/src/testdir/test95.ok
+++ b/src/testdir/test95.ok
@@ -94,6 +94,22 @@
 OK 0 - ק‍x\Z
 OK 1 - ק‍x\Z
 OK 2 - ק‍x\Z
+OK 0 - ֹ\Z
+OK 1 - ֹ\Z
+OK 2 - ֹ\Z
+OK 0 - \Zֹ
+OK 1 - \Zֹ
+OK 2 - \Zֹ
+OK 0 - ֹ\Z
+OK 1 - ֹ\Z
+OK 2 - ֹ\Z
+OK 0 - \Zֹ
+OK 1 - \Zֹ
+OK 2 - \Zֹ
+OK 0 - ֹ\+\Z
+OK 2 - ֹ\+\Z
+OK 0 - \Zֹ\+
+OK 2 - \Zֹ\+
 OK 0 - [^[=a=]]\+
 OK 1 - [^[=a=]]\+
 OK 2 - [^[=a=]]\+
diff --git a/src/version.c b/src/version.c
index 30e6436..303a4d2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1023,
+/**/
     1022,
 /**/
     1021,