diff --git a/lib/77bit/test28.txt b/lib/77bit/test28.txt
index b1e17736d..442215b61 100644
--- a/lib/77bit/test28.txt
+++ b/lib/77bit/test28.txt
@@ -14,16 +14,22 @@ CQ_AAAA
 CQ_ZZZZ      
 EI30T        
 YW18FIFA     
+KH1/KH7Z
 <KH1/KH7Z>   
 ZS9YOTA      
-YB50ST       
-999ABC       
+YB50ST
+00A
+99ZZZ
+000A
+009ZZZ
+999ZZZ
 HA70BAY      
 WB2000XYZ    
 WB2000XYZABCD
 ZM90DX       
 <VP2E/KA1ABC>
 HB9GOLD      
+A0
 A0A
 K1ABC        
 K1JT         
diff --git a/lib/77bit/unpack28.f90 b/lib/77bit/unpack28.f90
index 84603e37c..aef0a85af 100644
--- a/lib/77bit/unpack28.f90
+++ b/lib/77bit/unpack28.f90
@@ -45,6 +45,10 @@ subroutine unpack28(n28_0,c13)
 ! This is a 22-bit hash of a callsign
      n22=n28
      call hash22(n22,c13,-1)     !Retrieve callsign from hash table
+     if(c13(1:1).ne.'<') then
+        n=len(trim(c13))
+        c13='<'//c13(1:n)//'>'//'         '
+     endif
      go to 900
   endif