diff --git a/src/analyzer/main.cpp b/src/analyzer/main.cpp
index e4e4e070..e8ac862c 100644
--- a/src/analyzer/main.cpp
+++ b/src/analyzer/main.cpp
@@ -156,7 +156,7 @@ namespace
 
             auto read_handler = [&, section, concise_logging](const uint64_t address, size_t, uint64_t) {
                 const auto rip = win_emu.emu().read_instruction_pointer();
-                if (win_emu.mod_manager.find_by_address(rip) != win_emu.mod_manager.executable)
+                if (!win_emu.mod_manager.executable->is_within(rip))
                 {
                     return;
                 }
@@ -178,7 +178,7 @@ namespace
 
             const auto write_handler = [&, section, concise_logging](const uint64_t address, size_t, uint64_t) {
                 const auto rip = win_emu.emu().read_instruction_pointer();
-                if (win_emu.mod_manager.find_by_address(rip) != win_emu.mod_manager.executable)
+                if (!win_emu.mod_manager.executable->is_within(rip))
                 {
                     return;
                 }