diff --git a/src/emucore/Thumbulator.cxx b/src/emucore/Thumbulator.cxx
index 0a5b170f7..92faae0a2 100644
--- a/src/emucore/Thumbulator.cxx
+++ b/src/emucore/Thumbulator.cxx
@@ -184,32 +184,31 @@ uInt32 Thumbulator::fetch16(uInt32 addr)
   ++fetches;
 #endif
 
+#ifndef UNSAFE_OPTIMIZATIONS
   uInt32 data;
   switch(addr & 0xF0000000)
   {
     case 0x00000000: //ROM
       addr &= ROMADDMASK;
-#ifndef UNSAFE_OPTIMIZATIONS
       if(addr < 0x50)
         fatalError("fetch16", addr, "abort");
-#endif
       addr >>= 1;
       data = CONV_RAMROM(rom[addr]);
       DO_DBUG(statusMsg << "fetch16(" << Base::HEX8 << addr << ")=" << Base::HEX4 << data << endl);
       return data;
-#ifndef UNSAFE_OPTIMIZATIONS
+
     case 0x40000000: //RAM
-#else
-    default:
-#endif
       addr &= RAMADDMASK;
       addr >>= 1;
       data=CONV_RAMROM(ram[addr]);
       DO_DBUG(statusMsg << "fetch16(" << Base::HEX8 << addr << ")=" << Base::HEX4 << data << endl);
       return data;
   }
-#ifndef UNSAFE_OPTIMIZATIONS
   return fatalError("fetch16", addr, "abort");
+#else
+  addr &= ROMADDMASK;
+  addr >>= 1;
+  return CONV_RAMROM(rom[addr]);
 #endif
 }
 
diff --git a/src/windows/Stella.vcxproj b/src/windows/Stella.vcxproj
index e01e34941..bbfeedad3 100644
--- a/src/windows/Stella.vcxproj
+++ b/src/windows/Stella.vcxproj
@@ -344,7 +344,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <DisableSpecificWarnings>4100;4127;4146;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <CompileAs>CompileAsCpp</CompileAs>
-      <AssemblerOutput>NoListing</AssemblerOutput>
+      <AssemblerOutput>All</AssemblerOutput>
     </ClCompile>
     <Link>
       <AdditionalDependencies>SDL2.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>