diff --git a/src/quickfix.c b/src/quickfix.c
index c8954cc..abb4a6e 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -592,6 +592,8 @@
 restofline:
 	for ( ; fmt_ptr != NULL; fmt_ptr = fmt_ptr->next)
 	{
+	    int r;
+
 	    idx = fmt_ptr->prefix;
 	    if (multiscan && vim_strchr((char_u *)"OPQ", idx) == NULL)
 		continue;
@@ -607,7 +609,9 @@
 	    tail = NULL;
 
 	    regmatch.regprog = fmt_ptr->prog;
-	    if (vim_regexec(&regmatch, IObuff, (colnr_T)0))
+	    r = vim_regexec(&regmatch, IObuff, (colnr_T)0);
+	    fmt_ptr->prog = regmatch.regprog;
+	    if (r)
 	    {
 		if ((idx == 'C' || idx == 'Z') && !multiline)
 		    continue;
diff --git a/src/version.c b/src/version.c
index eb86713..cd7bfb1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    554,
+/**/
     553,
 /**/
     552,