diff --git a/iguana/iguana_bundles.c b/iguana/iguana_bundles.c
index e43918bff..7c12ee300 100755
--- a/iguana/iguana_bundles.c
+++ b/iguana/iguana_bundles.c
@@ -559,7 +559,7 @@ int32_t iguana_bundleissuemissing(struct iguana_info *coin,struct iguana_bundle
                 }
             }
         }
-        if ( firsti >= 0 && (coin->enableCACHE != 0 || nonz < 10 || bp == coin->current) )
+        if ( firsti >= 0 && (coin->enableCACHE != 0 || bp == coin->current) )
         {
             //printf("[%d] first missing.%d of %d\n",bp->hdrsi,firsti,nonz);
             iguana_bundleblock(coin,&hash2,bp,firsti);
diff --git a/iguana/main.c b/iguana/main.c
index 0c2767649..36adfa8b3 100755
--- a/iguana/main.c
+++ b/iguana/main.c
@@ -388,7 +388,7 @@ void mainloop(struct supernet_info *myinfo)
                     {
                         isRT *= coin->isRT;
                         numpeers += coin->peers.numranked;
-                        if ( coin->spendvectorsaved == 0 && time(NULL) > coin->startutc+10 )
+                        if ( coin->spendvectorsaved == 0 && coin->blocks.hwmchain.height >= coin->longestchain-3 )
                         {
                             n = coin->bundlescount-1;
                             if ( iguana_emitfinished(coin) >= n )