diff --git a/decodedtext.cpp b/decodedtext.cpp
index 6ac3dcc..60b795e 100644
--- a/decodedtext.cpp
+++ b/decodedtext.cpp
@@ -145,7 +145,10 @@ bool DecodedText::tryUnpackHeartbeat(){
         cmp.append(parts.at(1));
     }
     compound_ = cmp.join("/");
-    message_ = QString("%1: @ALLCALL %2 %3 ").arg(compound_).arg(isAlt ? Varicode::cqString(bits3) : Varicode::hbString(bits3)).arg(extra_);
+
+    auto to = "@ALLCALL";
+    auto hborcq = isAlt ? Varicode::cqString(bits3) : Varicode::hbString(bits3);
+    message_ = QString("%1: %2 %3 %4 ").arg(compound_).arg(to).arg(hborcq).arg(extra_);
     frameType_ = type;
     return true;
 }
diff --git a/varicode.cpp b/varicode.cpp
index f771fdd..af1d102 100644
--- a/varicode.cpp
+++ b/varicode.cpp
@@ -145,7 +145,7 @@ QRegularExpression directed_re("^"                    +
                                optional_cmd_pattern   +
                                optional_num_pattern);
 
-QRegularExpression heartbeat_re(R"(^\s*(?<callsign>[@]ALLCALL\s+)?(?<type>CQ CQ CQ|CQ DX|CQ QRP|CQ CONTEST|CQ FIELD|CQ FD|CQ CQ|CQ|HB)(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)");
+QRegularExpression heartbeat_re(R"(^\s*(?<callsign>[@](?:ALLCALL)\s+)?(?<type>CQ CQ CQ|CQ DX|CQ QRP|CQ CONTEST|CQ FIELD|CQ FD|CQ CQ|CQ|HB)(?:\s(?<grid>[A-R]{2}[0-9]{2}))?\b)");
 
 QRegularExpression compound_re("^\\s*[`]"              +
                                callsign_pattern        +