diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index 27d031e..2c4efc5 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -150,6 +150,7 @@
         # Handle state transition and skipping blank lines
         series_tag_match = re_series_tag.match(line)
         commit_tag_match = re_commit_tag.match(line)
+        cover_match = re_cover.match(line)
         cover_cc_match = re_cover_cc.match(line)
         signoff_match = re_signoff.match(line)
         tag_match = None
@@ -203,7 +204,7 @@
             self.skip_blank = False
 
         # Detect the start of a cover letter section
-        elif re_cover.match(line):
+        elif cover_match:
             self.in_section = 'cover'
             self.skip_blank = False