diff --git a/src/komodo_defs.h b/src/komodo_defs.h
index 2c3647b30..e1b941197 100644
--- a/src/komodo_defs.h
+++ b/src/komodo_defs.h
@@ -34,6 +34,10 @@
 #define GETBIT(bits,bitoffset) (((uint8_t *)bits)[(bitoffset) >> 3] & (1 << ((bitoffset) & 7)))
 #define CLEARBIT(bits,bitoffset) (((uint8_t *)bits)[(bitoffset) >> 3] &= ~(1 << ((bitoffset) & 7)))
 
+#define KOMODO_MAXNVALUE (((uint64_t)1 << 63) - 1)
+#define KOMODO_BIT63SET(x) ((x) & ((uint64_t)1 << 63))
+#define KOMODO_VALUETOOBIG(x) ((x) > (uint64_t)10000000000*COIN)
+
 extern uint8_t ASSETCHAINS_TXPOW,ASSETCHAINS_PUBLIC;
 int32_t MAX_BLOCK_SIZE(int32_t height);
 extern char ASSETCHAINS_SYMBOL[KOMODO_ASSETCHAIN_MAXLEN];
diff --git a/src/komodo_globals.h b/src/komodo_globals.h
index a752d0b8b..44c12bdf4 100644
--- a/src/komodo_globals.h
+++ b/src/komodo_globals.h
@@ -263,11 +263,7 @@ uint64_t komodo_current_supply(uint32_t nHeight)
                 }
             }
         }
-    }
-#define KOMODO_MAXNVALUE (((uint64_t)1 << 63) - 1)
-#define KOMODO_BIT63SET(x) ((x) & ((uint64_t)1 << 63))
-#define KOMODO_VALUETOOBIG(x) ((x) > (uint64_t)10000000000*COIN)
-    
+    }    
     if ( KOMODO_BIT63SET(cur_money) != 0 )
         return(KOMODO_MAXNVALUE);
     if ( ASSETCHAINS_COMMISSION != 0 )
diff --git a/src/miner.cpp b/src/miner.cpp
index eb7c2d185..2069e5a8c 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -221,7 +221,6 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
 
     uint256 cbHash;
 
-    voutsum = GetBlockSubsidy(nHeight,consensusParams) + nFees;
     CBlockIndex* pindexPrev = 0;
     {
         ENTER_CRITICAL_SECTION(cs_main);
@@ -234,7 +233,8 @@ CBlockTemplate* CreateNewBlock(CPubKey _pk,const CScript& _scriptPubKeyIn, int32
 
         const int64_t nMedianTimePast = pindexPrev->GetMedianTimePast();
         uint32_t proposedTime = GetAdjustedTime();
-                
+        voutsum = GetBlockSubsidy(nHeight,consensusParams) + 10000*COIN; // approx fees
+
         if (proposedTime == nMedianTimePast)
         {
             // too fast or stuck, this addresses the too fast issue, while moving