diff --git a/src/coins.h b/src/coins.h
index 7b6395a40..d8471d28d 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -305,6 +305,9 @@ private:
 void AddCoins(CCoinsViewCache& cache, const CTransaction& tx, int nHeight);
 
 //! Utility function to find any unspent output with a given txid.
+// This function can be quite expensive because in the event of a transaction
+// which is not found in the cache, it can cause up to MAX_OUTPUTS_PER_BLOCK
+// lookups to database, so it should be used with care.
 const Coin& AccessByTxid(const CCoinsViewCache& cache, const uint256& txid);
 
 #endif // BITCOIN_COINS_H
diff --git a/src/validation.cpp b/src/validation.cpp
index 2e972e251..f5e6259bd 100644
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -1715,6 +1715,7 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
     for (int i = block.vtx.size() - 1; i >= 0; i--) {
         const CTransaction &tx = block.vtx[i];
         uint256 hash = tx.GetHash();
+        bool is_coinbase = tx.IsCoinBase();
 
         if (fAddressIndex) {
 
@@ -1754,7 +1755,7 @@ static DisconnectResult DisconnectBlock(const CBlock& block, CValidationState& s
                 COutPoint out(hash, o);
                 Coin coin;
                 bool is_spent = view.SpendCoin(out, &coin);
-                if (!is_spent || tx.vout[o] != coin.out) {
+                if (!is_spent || tx.vout[o] != coin.out || pindex->nHeight != coin.nHeight || is_coinbase != coin.fCoinBase) {
                     fClean = false; // transaction output mismatch
                 }
             }