diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 157d3eb..4f2b925 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -2859,7 +2859,7 @@
     List	*listtbl[2][2];
     List	*ll;
     int		listid = 1;
-    int		endnode = 0;
+    int		endnode;
     List	*thislist;
     List	*nextlist;
     List	*neglist;
@@ -3192,13 +3192,7 @@
 
 	    case NFA_MULTIBYTE:
 	    case NFA_COMPOSING:
-		switch (t->state->c)
-		{
-		    case NFA_MULTIBYTE:	    endnode = NFA_END_MULTIBYTE; break;
-		    case NFA_COMPOSING:	    endnode = NFA_END_COMPOSING; break;
-		    default:		    endnode = 0;
-		}
-
+	        endnode = t->state->c + 1;
 		result = OK;
 		sta = t->state->out;
 		len = 1;
@@ -3206,7 +3200,7 @@
 		{
 		    if (reginput[len-1] != sta->c)
 		    {
-			result = OK - 1;
+			result = FAIL;
 			break;
 		    }
 		    len++;
@@ -3215,11 +3209,11 @@
 
 		/* if input char length doesn't match regexp char length */
 		if (len -1 < n || sta->c != endnode)
-		    result = OK - 1;
+		    result = FAIL;
 		end = t->state->out1;	    /* NFA_END_MULTIBYTE or
 					       NFA_END_COMPOSING */
 		/* If \Z was present, then ignore composing characters */
-		if (regflags & RF_ICOMBINE)
+		if (ireg_icombine && endnode == NFA_END_COMPOSING)
 		    result = 1 ^ sta->negated;
 		ADD_POS_NEG_STATE(end);
 		break;
diff --git a/src/testdir/test95.in b/src/testdir/test95.in
index 41e3f78..e332b97 100644
--- a/src/testdir/test95.in
+++ b/src/testdir/test95.in
@@ -7,7 +7,7 @@
 STARTTEST
 :so small.vim
 :so mbyte.vim
-:set nocp encoding=utf-8 viminfo+=nviminfo
+:set nocp encoding=utf-8 viminfo+=nviminfo nomore
 :" tl is a List of Lists with:
 :"    regexp pattern
 :"    text to test the pattern on
@@ -35,11 +35,13 @@
 :call add(tl, ['\f\+', '&*fname ', 'fname'])
 :call add(tl, ['\%#=1\f\+', '&*fname ', 'fname'])
 
+:"""" Test \Z
+:call add(tl, ['ú\Z', 'x'])
+
 :"""" Combining different tests and features
 :call add(tl, ['[^[=a=]]\+', 'ddaãâbcd', 'dd'])
 
 :"""" Run the tests
-
 :"
 :for t in tl
 :  let l = matchlist(t[1], t[0])
diff --git a/src/testdir/test95.ok b/src/testdir/test95.ok
index 4c1f0ca..23d2284 100644
--- a/src/testdir/test95.ok
+++ b/src/testdir/test95.ok
@@ -9,4 +9,5 @@
 OK - \%#=1\i\+
 OK - \f\+
 OK - \%#=1\f\+
+OK - ú\Z
 OK - [^[=a=]]\+
diff --git a/src/version.c b/src/version.c
index 8504dfe..ffc138e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1010,
+/**/
     1009,
 /**/
     1008,