diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index d7b507290..e9b3a7def 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -770,7 +770,7 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
     memset(pubkey33,0,33);
     if ( pindex != 0 )
     {
-        if ( pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3 || pindex->pubkey33[0] == 0xff )
+        if ( pindex->didinit != 0 )
         {
             memcpy(pubkey33,pindex->pubkey33,33);
             return;
@@ -785,7 +785,7 @@ int8_t komodo_minerid(int32_t height,uint8_t *pubkey33)
     int32_t num,i,numnotaries; CBlockIndex *pindex; uint32_t timestamp=0; uint8_t _pubkey33[33],pubkeys[64][33];
     if ( (pindex= chainActive[height]) != 0 )
     {
-        if ( pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3 || pindex->pubkey33[0] == 0xff )
+        if ( pindex->didinit != 0 )
         {
             if ( pubkey33 != 0 )
                 memcpy(pubkey33,pindex->pubkey33,33);
@@ -812,7 +812,7 @@ int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *non
     {
         if ( (pindex= komodo_chainactive(height-i)) != 0 )
         {
-            if ( pindex->notaryid >= 0 && (pindex->pubkey33[0] == 2 || pindex->pubkey33[0] == 3 || pindex->pubkey33[0] == 0xff) )
+            if ( pindex->notaryid >= 0 && pindex->didinit != 0 )
             {
                 memcpy(pubkeys[i],pindex->pubkey33,33);
                 mids[i] = pindex->notaryid;
diff --git a/src/pow.cpp b/src/pow.cpp
index a3cd4872b..423341d0f 100644
--- a/src/pow.cpp
+++ b/src/pow.cpp
@@ -199,8 +199,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in
         printf(" ht.%d special.%d notaryid.%d ht.%d mod.%d error\n",height,special,notaryid,height,(height % 35));
         if ( pindex != 0 )
         {
-            pindex->notaryid = -1;
-            memset(pindex->pubkey33,0,33);
+            pindex->didinit = 0;
             komodo_pindex_init(pindex,height);
         }
         for (i=0; i<33; i++)