diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c
index 0e172c8..203d9ff 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -3782,6 +3782,9 @@
     if (two_unused)
 	/* one is used and two is not: not equal */
 	return FALSE;
+    /* compare the state id */
+    if (one->state->id != two->state->id)
+	return FALSE;
     /* compare the position */
     if (REG_MULTI)
 	return one->end.pos.lnum == two->end.pos.lnum
diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index b29fe76..ac3f13d 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -421,6 +421,9 @@
 :call add(tl, [2, '\(foo\)\@<=\>', 'barfoo', '', 'foo'])
 :call add(tl, [2, '\(foo\)\@<=.*', 'foobar', 'bar', 'foo'])
 :"
+:" complicated look-behind match
+:call add(tl, [2, '\(r\@<=\|\w\@<!\)\/', 'x = /word/;', '/'])
+:"
 :""""" \@>
 :call add(tl, [2, '\(a*\)\@>a', 'aaaa'])
 :call add(tl, [2, '\(a*\)\@>b', 'aaab', 'aaab', 'aaa'])
diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index 733ad87..da19c04 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -974,6 +974,9 @@
 OK 0 - \(foo\)\@<=.*
 OK 1 - \(foo\)\@<=.*
 OK 2 - \(foo\)\@<=.*
+OK 0 - \(r\@<=\|\w\@<!\)\/
+OK 1 - \(r\@<=\|\w\@<!\)\/
+OK 2 - \(r\@<=\|\w\@<!\)\/
 OK 0 - \(a*\)\@>a
 OK 1 - \(a*\)\@>a
 OK 2 - \(a*\)\@>a
diff --git a/src/version.c b/src/version.c
index 8eccd3c..f23fd0d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2,
+/**/
     1,
 /**/
     0