diff --git a/lib/nexrad/afos.py b/lib/nexrad/afos.py
index 7914e07..4287d1b 100644
--- a/lib/nexrad/afos.py
+++ b/lib/nexrad/afos.py
@@ -217,7 +217,6 @@ class AFOSMessageParser():
             self.message.vtec_end   = vtec.timestamp_end
             self.message.vtec_type  = vtec.typeof
             self.message.actions    = vtec.actions
-            self.message.wfo        = vtec.wfo
             self.message.phenom     = vtec.phenom
             self.message.sig        = vtec.sig
             self.message.etn        = vtec.etn
@@ -250,6 +249,7 @@ class AFOSMessageParser():
 
         if match is not None:
             self.message.product = match['product']
+            self.message.wfo     = match['wfo']
             self.state = AFOSMessageParserState.BODY
 
     def parse_body(self, line: str):