From 58491dec69c06ca8b3d8291b2f9ad2b4bd217fa2 Mon Sep 17 00:00:00 2001
From: AJR <ajrhacker@users.noreply.github.com>
Date: Mon, 12 Mar 2018 00:15:01 -0400
Subject: [PATCH] Better fix for find command (nw)

---
 src/emu/debug/debugcmd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/emu/debug/debugcmd.cpp b/src/emu/debug/debugcmd.cpp
index 424c79486b6..6b393e21552 100644
--- a/src/emu/debug/debugcmd.cpp
+++ b/src/emu/debug/debugcmd.cpp
@@ -2474,8 +2474,8 @@ void debugger_commands::execute_find(int ref, const std::vector<std::string> &pa
 		return;
 
 	/* further validation */
-	endoffset = (offset + length - 1) & space->addrmask();
-	offset = offset & space->addrmask();
+	endoffset = space->address_to_byte_end((offset + length - 1) & space->addrmask());
+	offset = space->address_to_byte(offset & space->addrmask());
 	cur_data_size = space->addr_shift() > 0 ? 2 : 1 << -space->addr_shift();
 	if (cur_data_size == 0)
 		cur_data_size = 1;