diff --git a/ChangeLog b/ChangeLog
index 457a4a6..0cb23e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -79,6 +79,9 @@ not do this, leading to bad output from pcre2test when it was checking for
 buffer overflow. It no longer assumes a binary zero at the end of a too-small 
 regerror() buffer.
 
+17. Fixed typo ("&&" for "&") in pcre2_study(). Fortunately, this could not 
+actually affect anything, by sheer luck.
+
 
 Version 10.21 12-January-2016
 -----------------------------
diff --git a/src/pcre2_study.c b/src/pcre2_study.c
index 18932ad..db08266 100644
--- a/src/pcre2_study.c
+++ b/src/pcre2_study.c
@@ -1452,7 +1452,7 @@ do
           for (c = 0; c < 16; c++) re->start_bitmap[c] |= classmap[c];
           for (c = 128; c < 256; c++)
             {
-            if ((classmap[c/8] && (1 << (c&7))) != 0)
+            if ((classmap[c/8] & (1 << (c&7))) != 0)
               {
               int d = (c >> 6) | 0xc0;            /* Set bit for this starter */
               re->start_bitmap[d/8] |= (1 << (d&7));  /* and then skip on to the */