diff --git a/mozilla/js/src/jsregexp.c b/mozilla/js/src/jsregexp.c
index 67e62e8beb5..e353226b4b2 100644
--- a/mozilla/js/src/jsregexp.c
+++ b/mozilla/js/src/jsregexp.c
@@ -15,7 +15,7 @@
  * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
  * Reserved.
  */
-
+#define DEBUG_notme
 /*
  * JS regular expressions, after Perl.
  */
@@ -353,15 +353,17 @@ DumpRegExp(JSContext *cx, RENode *ren)
 	    len = (jschar *)ren->u.kid2 - cp;
 	    for (i = 0; i < len; i++)
 		PrintChar(cp[i]);
+            printf("\n");
 	    break;
 
 	  case REOP_UCFLAT1:
 	    PrintChar(ren->u.chr);
+	    printf("\n");
 	    break;
 
 	  case REOP_UCCLASS:
 	    cp = ren->kid;
-	    len = (jschar *)ren->u.kid2 - cp;
+	    len = ren->u.ucclass.kidlen;
 	    printf(" [");
 	    for (i = 0; i < len; i++)
 		PrintChar(cp[i]);
@@ -2379,6 +2381,8 @@ MatchRegExp(MatchState *state, jsbytecode *pc, const jschar *cp)
 		bit = 1 << bit;                                               \
 		matched = pc[3 + byte] & bit;                                 \
 	    }                                                                 \
+            if (matched)                                                      \
+                pc2 = pc + size + reopsize[op];                               \
 	    matchlen = 1;                                                     \
 	    break;                                                            \
 /* END NONDOT_SINGLE_CASES */