diff --git a/lib/wsprd/wsprd_utils.c b/lib/wsprd/wsprd_utils.c
index 974dd34e2..65485d4b2 100644
--- a/lib/wsprd/wsprd_utils.c
+++ b/lib/wsprd/wsprd_utils.c
@@ -301,7 +301,8 @@ int unpk_(signed char *message, char *hashtab, char *call_loc_pow, char *callsig
     } else if ( ntype < 0 ) {
         ndbm=-(ntype+1);
         memset(grid6,0,sizeof(char)*7);
-        size_t len=strlen(callsign);
+//        size_t len=strlen(callsign);
+        size_t len=6;
         strncat(grid6,callsign+len-1,1);
         strncat(grid6,callsign,len-1);
         int nu=ndbm%10;
diff --git a/lib/wsprd/wsprsim_utils.c b/lib/wsprd/wsprsim_utils.c
index ac107320a..d4a53c8b6 100644
--- a/lib/wsprd/wsprsim_utils.c
+++ b/lib/wsprd/wsprsim_utils.c
@@ -59,8 +59,9 @@ long unsigned int pack_call(char *callsign) {
             }
         }
     } else if( isdigit(*(callsign+1)) ) {
-        for (i=0; i<call_len; i++) {
-            if( i==0 || callsign[i-1]==0 ) {
+        call6[0]=32;
+        for (i=1; i<call_len+1; i++) {
+            if( callsign[i-1]==0 ) {
                 call6[i]=32;
             } else {
                 call6[i]=*(callsign+i-1);