diff --git a/src/emucore/CartEnhanced.cxx b/src/emucore/CartEnhanced.cxx
index b401da819..4696fc963 100644
--- a/src/emucore/CartEnhanced.cxx
+++ b/src/emucore/CartEnhanced.cxx
@@ -295,7 +295,7 @@ bool CartridgeEnhanced::bank(uInt16 bank, uInt16 segment)
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-inline uInt16 CartridgeEnhanced::romAddressSegmentOffset(uInt16 address) const
+inline uInt32 CartridgeEnhanced::romAddressSegmentOffset(uInt16 address) const
 {
   return myCurrentSegOffset[((address & ROM_MASK) >> myBankShift) % myBankSegs];
 }
diff --git a/src/emucore/CartEnhanced.hxx b/src/emucore/CartEnhanced.hxx
index 98fb8e910..33bd95993 100644
--- a/src/emucore/CartEnhanced.hxx
+++ b/src/emucore/CartEnhanced.hxx
@@ -275,7 +275,7 @@ class CartridgeEnhanced : public Cartridge
       @param address  The address to get the offset for
       @return  The calculated offset
     */
-    uInt16 romAddressSegmentOffset(uInt16 address) const;
+    uInt32 romAddressSegmentOffset(uInt16 address) const;
 
     /**
       Get the RAM offset of the segment of the given address