diff --git a/plugins/analyzer_office.py b/plugins/analyzer_office.py
index 9f140dd..74e0eba 100644
--- a/plugins/analyzer_office.py
+++ b/plugins/analyzer_office.py
@@ -60,10 +60,9 @@ def augmentFileWord(fileOffice: FileOffice, matches: List[Match]):
         sectionName = ac.getSectionsForAddr(m.start(), m.size)
         detail = ''
 
-        itemSet = results.at(m.fileOffset)
+        itemSet = results.overlap(m.fileOffset, m.fileOffset+m.size)
         details = []
         for item in iter(itemSet):
-            item = next(iter(itemSet))
             detail = {}
             detail['part'] = True
             detail['textHtml'] = "{} {} {}: ".format(item.data.lineNr, item.data.begin, item.data.end) + "\n" + item.data.text
diff --git a/tests/test_makro_disasm.py b/tests/test_makro_disasm.py
index cafa9f1..1007a85 100644
--- a/tests/test_makro_disasm.py
+++ b/tests/test_makro_disasm.py
@@ -33,7 +33,7 @@ class DisasmMakroTest(unittest.TestCase):
         self.assertEqual(ac.physicalAddressFor("VBA/ThisDocument", 1024+1), 7168+1)
 
         self.assertEqual(ac.physicalAddressFor("VBA/ThisDocument", 4093), 10237)
-        self.assertEqual(ac.physicalAddressFor("VBA/ThisDocument", 4125), 1565)  # not: smaller address
+        self.assertEqual(ac.physicalAddressFor("VBA/ThisDocument", 4125), 10269)
 
 
     def test_AddressConverterGetSection(self):