diff --git a/src/cc/rogue/state.c b/src/cc/rogue/state.c
index 96d576501..817993c17 100644
--- a/src/cc/rogue/state.c
+++ b/src/cc/rogue/state.c
@@ -1397,9 +1397,6 @@ void rogue_packitemstr(char *packitemstr,struct rogue_packitem *item)
     THING *obj = new_item();
     rogue_restoreobject(obj,item);
     strcpy(packitemstr,inv_name(obj,FALSE));
-    for (i=0; packitemstr[i]!=0; i++)
-        if ( packitemstr[i] < ' ' || (uint8_t)packitemstr[i] >= 0x80 )
-            packitemstr[i] = ' ';
     //fprintf(stderr,"packitem.(%s)\n",packitemstr);
     free(obj);
 }
diff --git a/src/cc/rogue_rpc.cpp b/src/cc/rogue_rpc.cpp
index e6ccc3352..f33d4d583 100644
--- a/src/cc/rogue_rpc.cpp
+++ b/src/cc/rogue_rpc.cpp
@@ -189,6 +189,7 @@ uint8_t rogue_highlanderopretdecode(uint256 &gametxid, int32_t &regslot, CPubKey
     else if ( script[1] == 't' && (f= DecodeTokenOpRet(scriptPubKey, e, tokenid, voutPubkeys, vopretDummy)) != 0 )
     {
         GetNonfungibleData(tokenid, vopretNonfungible);  //load nonfungible data from the 'tokenbase' tx
+        vopret = vopretNonfungible;
     }
     if ( vopret.size() > 2 && E_UNMARSHAL(vopret, ss >> e; ss >> f; ss >> gametxid; ss >> regslot; ss >> pk; ss >> playerdata) != 0 && e == EVAL_ROGUE && (f == 'H' || f == 'Q') )
     {