--- code/trunk/pcre_dfa_exec.c	2010/11/21 12:55:42	575
+++ code/trunk/pcre_dfa_exec.c	2010/11/21 18:45:10	576
@@ -3057,9 +3057,11 @@
 
     /* There are some optimizations that avoid running the match if a known
     starting point is not found. However, there is an option that disables
-    these, for testing and for ensuring that all callouts do actually occur. */
+    these, for testing and for ensuring that all callouts do actually occur. 
+    The option can be set in the regex by (*NO_START_OPT) or passed in
+    match-time options. */
 
-    if ((options & PCRE_NO_START_OPTIMIZE) == 0)
+    if (((options | re->options) & PCRE_NO_START_OPTIMIZE) == 0)
       {
       /* Advance to a known first byte. */