diff --git a/src/script/script.h b/src/script/script.h
index 59ceff247c..224785d999 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -594,12 +594,12 @@ public:
         if (b.empty())
             return nFound;
         CScript result;
-        iterator pc = begin(), pc2 = begin();
+        const_iterator pc = begin(), pc2 = begin(), end = this->end();
         opcodetype opcode;
         do
         {
             result.insert(result.end(), pc2, pc);
-            while (static_cast<size_t>(end() - pc) >= b.size() && std::equal(b.begin(), b.end(), pc))
+            while (static_cast<size_t>(end - pc) >= b.size() && std::equal(b.begin(), b.end(), pc))
             {
                 pc = pc + b.size();
                 ++nFound;
@@ -609,7 +609,7 @@ public:
         while (GetOp(pc, opcode));
 
         if (nFound > 0) {
-            result.insert(result.end(), pc2, end());
+            result.insert(result.end(), pc2, end);
             *this = result;
         }