diff --git a/hash/vis.xml b/hash/vis.xml
index 8537023e503..cc6105ea601 100644
--- a/hash/vis.xml
+++ b/hash/vis.xml
@@ -5,8 +5,8 @@ license:CC0
 -->
 <softwarelist name="vis" description="Tandy/Memorex Video Information System CD-ROM images">
 
-	<!-- Garbled text -->
-	<software name="amherit" supported="no">
+	<!-- Some images only fill half the screen -->
+	<software name="amherit" supported="partial">
 		<!--
 		Origin: redump.org
 		<rom name="American Heritage - Illustrated Encyclopedic Dictionary (USA).bin" size="437163888" crc="4f245ee3" sha1="4b12b3686c109a82d86f76394f8f6c4513ce4911"/>
diff --git a/src/devices/cpu/i86/i86inline.h b/src/devices/cpu/i86/i86inline.h
index 1aa90deb116..fb14cbcdee8 100644
--- a/src/devices/cpu/i86/i86inline.h
+++ b/src/devices/cpu/i86/i86inline.h
@@ -378,7 +378,7 @@ inline uint16_t i8086_common_cpu_device::GetRMWord()
 
 inline uint16_t i8086_common_cpu_device::GetnextRMWord()
 {
-	return read_word((m_ea & ~0xffff) | ((m_ea + 2) & 0xffff));
+	return read_word((m_ea - m_eo) + ((m_eo + 2) & 0xffff));
 }