diff --git a/CMakeLists.txt b/CMakeLists.txt
index d99cfe9e..33311c73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,6 +359,7 @@ if(MSVC)
           ${DEFAULT_CXX_EXCEPTION_HANDLING}
       )
       target_compile_options(${PROJECT_NAME} PRIVATE  $<$<CONFIG:Debug>:/ZI;>)
+      target_compile_options(${PROJECT_NAME} PRIVATE  $<$<CONFIG:Release>:/Zi;>)
   elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32")
       target_compile_options(${PROJECT_NAME} PRIVATE
           $<$<CONFIG:Debug>:
diff --git a/src/engine/fox_radio.c b/src/engine/fox_radio.c
index 9cde4152..91708ad6 100644
--- a/src/engine/fox_radio.c
+++ b/src/engine/fox_radio.c
@@ -572,7 +572,6 @@ void Radio_Draw(void) {
         case 32:
             if (Audio_GetCurrentVoice() == 0) {
                 gRadioMsgListIndex++;
-                gRadioMsgId = 10 * (gRadioMsgListIndex + 1);
                 gRadioMsg = SEGMENTED_TO_VIRTUAL(gRadioMsgList[gRadioMsgListIndex]);
                 Audio_PlayVoice(Message_IdFromPtr(gRadioMsg));
                 gRadioMsgCharIndex = 0;
@@ -603,16 +602,15 @@ void Radio_Draw(void) {
             if (!(fakeTemp)) {
                 ret = Audio_GetCurrentVoiceStatus();
 
-                if (gRadioMsgId < 50) {
-                    if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT) {
+                if (gRadioMsgCharIndex < 60) {
+                    if (gRadioMsg[gRadioMsgCharIndex + 1] == MSGCHAR_NXT && *gRadioMsg != 38) {
                         if (ret == 0) {
                             gRadioState = 31;
                         }
-                    } else {
+                    }
+                    else {
                         gRadioMsgCharIndex++;
                     }
-                } else {
-                    gRadioMsgCharIndex++;
                 }
 
                 if (sRadioCheckMouthFlag) {