diff --git a/iguana/iguana_spendvectors.c b/iguana/iguana_spendvectors.c
index d02d8b750..ac6b5a456 100755
--- a/iguana/iguana_spendvectors.c
+++ b/iguana/iguana_spendvectors.c
@@ -449,7 +449,7 @@ int32_t iguana_balancegen(struct iguana_info *coin,int32_t incremental,struct ig
     struct iguana_spendvector *spend; struct iguana_unspent *spentU,*u; struct iguana_spendvector *Xspendinds;
     struct iguana_txid *T; struct iguana_blockRO *B; struct iguana_bundle *spentbp;
     int32_t spent_hdrsi,spendind,n,numXspends,errs=0,emit=0; struct iguana_spend *S,*s;
-    ramchain = &bp->ramchain;//(bp == coin->current) ? &coin->RTramchain : &bp->ramchain;
+    ramchain = (bp == coin->current) ? &coin->RTramchain : &bp->ramchain;
     if ( (rdata= ramchain->H.data) == 0 || (n= rdata->numspends) < 1 )
         return(-1);
     S = (void *)(long)((long)rdata + rdata->Soffset);
diff --git a/iguana/iguana_tx.c b/iguana/iguana_tx.c
index 50bef94e6..1b6930b69 100755
--- a/iguana/iguana_tx.c
+++ b/iguana/iguana_tx.c
@@ -72,7 +72,7 @@ int32_t iguana_vinset(struct iguana_info *coin,uint8_t *scriptspace,int32_t heig
     memset(vin,0,sizeof(*vin));
     if ( height >= 0 && height < coin->chain->bundlesize*coin->bundlescount && (bp= coin->bundles[height / coin->chain->bundlesize]) != 0 )
     {
-        ramchain = &bp->ramchain;//(bp == coin->current) ? &coin->RTramchain : &bp->ramchain;
+        ramchain = (bp == coin->current) ? &coin->RTramchain : &bp->ramchain;
         if ( ((rdata= ramchain->H.data) != 0 || ((bp == coin->current && (rdata= coin->RTramchain.H.data) != 0))) && i < tx->numvins )
         //if ( (rdata= ramchain->H.data) != 0 && i < rdata->numspends )
         {
@@ -125,7 +125,7 @@ int32_t iguana_voutset(struct iguana_info *coin,uint8_t *scriptspace,char *asmst
     memset(vout,0,sizeof(*vout));
     if ( height >= 0 && height < coin->chain->bundlesize*coin->bundlescount && (bp= coin->bundles[height / coin->chain->bundlesize]) != 0  )
     {
-        ramchain = &bp->ramchain;//(bp == coin->current) ? &coin->RTramchain : &bp->ramchain;
+        ramchain = (bp == coin->current) ? &coin->RTramchain : &bp->ramchain;
         if ( ((rdata= ramchain->H.data) != 0 || ((bp == coin->current && (rdata= coin->RTramchain.H.data) != 0))) && i < tx->numvouts )
         {
             U = RAMCHAIN_PTR(rdata,Uoffset);
diff --git a/iguana/iguana_txidfind.c b/iguana/iguana_txidfind.c
index be09f6c2d..4a1a1cdc3 100755
--- a/iguana/iguana_txidfind.c
+++ b/iguana/iguana_txidfind.c
@@ -280,7 +280,7 @@ struct iguana_txid *iguana_txidfind(struct iguana_info *coin,int32_t *heightp,st
     {
         if ( (bp= coin->bundles[i]) != 0 && (bp == coin->current || bp->emitfinish > 1) )
         {
-            ramchain = &bp->ramchain;//(bp == coin->current) ? &coin->RTramchain : &bp->ramchain;
+            ramchain = (bp == coin->current) ? &coin->RTramchain : &bp->ramchain;
             if ( (rdata= ramchain->H.data) != 0 )
             {
                 if ( (TXbits= ramchain->txbits) == 0 )