diff --git a/qa/rpc-tests/addressindex.py b/qa/rpc-tests/addressindex.py
index 3ef5bcf675be3..e45efdbda378b 100755
--- a/qa/rpc-tests/addressindex.py
+++ b/qa/rpc-tests/addressindex.py
@@ -85,14 +85,15 @@ def run_test(self):
         assert_equal(txidsb[2], txidb2)
 
         # Check that limiting by height works
-        chain_height = self.nodes[1].getblockcount()
+        print "Testing querying txids by range of block heights.."
         height_txids = self.nodes[1].getaddresstxids({
             "addresses": ["2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br"],
-            "start": 111,
-            "end": 111
+            "start": 105,
+            "end": 110
         })
-        assert_equal(len(height_txids), 1)
-        assert_equal(height_txids[0], txidb2)
+        assert_equal(len(height_txids), 2)
+        assert_equal(height_txids[0], txidb0)
+        assert_equal(height_txids[1], txidb1)
 
         # Check that multiple addresses works
         multitxids = self.nodes[1].getaddresstxids({"addresses": ["2N2JD6wb56AfK4tfmM6PwdVmoYk2dCKf4Br", "mo9ncXisMeAoXwqcV5EWuyncbmCcQN4rVs"]})
diff --git a/src/main.h b/src/main.h
index c0d8d752492dc..4f9c85ec365bb 100644
--- a/src/main.h
+++ b/src/main.h
@@ -552,23 +552,14 @@ struct CAddressIndexKey {
 struct CAddressIndexIteratorKey {
     unsigned int type;
     uint160 hashBytes;
-    bool includeHeight;
-    int blockHeight;
 
     size_t GetSerializeSize(int nType, int nVersion) const {
-        if (includeHeight) {
-            return 25;
-        } else {
-            return 21;
-        }
+        return 21;
     }
     template<typename Stream>
     void Serialize(Stream& s, int nType, int nVersion) const {
         ser_writedata8(s, type);
         hashBytes.Serialize(s, nType, nVersion);
-        if (includeHeight) {
-            ser_writedata32be(s, blockHeight);
-        }
     }
     template<typename Stream>
     void Unserialize(Stream& s, int nType, int nVersion) {
@@ -579,24 +570,53 @@ struct CAddressIndexIteratorKey {
     CAddressIndexIteratorKey(unsigned int addressType, uint160 addressHash) {
         type = addressType;
         hashBytes = addressHash;
-        includeHeight = false;
     }
 
-    CAddressIndexIteratorKey(unsigned int addressType, uint160 addressHash, int height) {
+    CAddressIndexIteratorKey() {
+        SetNull();
+    }
+
+    void SetNull() {
+        type = 0;
+        hashBytes.SetNull();
+    }
+};
+
+struct CAddressIndexIteratorHeightKey {
+    unsigned int type;
+    uint160 hashBytes;
+    int blockHeight;
+
+    size_t GetSerializeSize(int nType, int nVersion) const {
+        return 25;
+    }
+    template<typename Stream>
+    void Serialize(Stream& s, int nType, int nVersion) const {
+        ser_writedata8(s, type);
+        hashBytes.Serialize(s, nType, nVersion);
+        ser_writedata32be(s, blockHeight);
+    }
+    template<typename Stream>
+    void Unserialize(Stream& s, int nType, int nVersion) {
+        type = ser_readdata8(s);
+        hashBytes.Unserialize(s, nType, nVersion);
+        blockHeight = ser_readdata32be(s);
+    }
+
+    CAddressIndexIteratorHeightKey(unsigned int addressType, uint160 addressHash, int height) {
         type = addressType;
         hashBytes = addressHash;
         blockHeight = height;
-        includeHeight = true;
     }
 
-    CAddressIndexIteratorKey() {
+    CAddressIndexIteratorHeightKey() {
         SetNull();
     }
 
     void SetNull() {
         type = 0;
         hashBytes.SetNull();
-        includeHeight = false;
+        blockHeight = 0;
     }
 };
 
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp
index 9e5266e31b2aa..91a45813a05d6 100644
--- a/src/rpcmisc.cpp
+++ b/src/rpcmisc.cpp
@@ -675,7 +675,7 @@ UniValue getaddresstxids(const UniValue& params, bool fHelp)
         UniValue endValue = find_value(params[0].get_obj(), "end");
         if (startValue.isNum() && endValue.isNum()) {
             start = startValue.get_int();
-            end = startValue.get_int();
+            end = endValue.get_int();
         }
     }
 
diff --git a/src/txdb.cpp b/src/txdb.cpp
index d3a29d5fd2be9..8a4d71578eae8 100644
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -242,7 +242,7 @@ bool CBlockTreeDB::ReadAddressIndex(uint160 addressHash, int type,
     boost::scoped_ptr<CDBIterator> pcursor(NewIterator());
 
     if (start > 0 && end > 0) {
-        pcursor->Seek(make_pair(DB_ADDRESSINDEX, CAddressIndexIteratorKey(type, addressHash, start)));
+        pcursor->Seek(make_pair(DB_ADDRESSINDEX, CAddressIndexIteratorHeightKey(type, addressHash, start)));
     } else {
         pcursor->Seek(make_pair(DB_ADDRESSINDEX, CAddressIndexIteratorKey(type, addressHash)));
     }
diff --git a/src/txdb.h b/src/txdb.h
index 62b115707b236..14d501278f23e 100644
--- a/src/txdb.h
+++ b/src/txdb.h
@@ -21,6 +21,7 @@ struct CAddressUnspentKey;
 struct CAddressUnspentValue;
 struct CAddressIndexKey;
 struct CAddressIndexIteratorKey;
+struct CAddressIndexIteratorHeightKey;
 struct CTimestampIndexKey;
 struct CTimestampIndexIteratorKey;
 struct CSpentIndexKey;