diff --git a/builds/genesis_plus_gx_libretro.dll b/builds/genesis_plus_gx_libretro.dll
index 9419d2f..44c8022 100644
Binary files a/builds/genesis_plus_gx_libretro.dll and b/builds/genesis_plus_gx_libretro.dll differ
diff --git a/builds/genplus_cube.dol b/builds/genplus_cube.dol
index 81c2b07..0d21f1f 100644
Binary files a/builds/genplus_cube.dol and b/builds/genplus_cube.dol differ
diff --git a/builds/genplus_wii.dol b/builds/genplus_wii.dol
index 23d900c..3793a59 100644
Binary files a/builds/genplus_wii.dol and b/builds/genplus_wii.dol differ
diff --git a/core/cd_hw/scd.c b/core/cd_hw/scd.c
index e25bab8..f3fa2be 100644
--- a/core/cd_hw/scd.c
+++ b/core/cd_hw/scd.c
@@ -1506,6 +1506,9 @@ void scd_init(void)
   cdc_init();
   gfx_init();
 
+  /* Initialize CD hardware master clock count per scanline */
+  scd.cycles_per_line = (uint32) (MCYCLES_PER_LINE * ((float)SCD_CLOCK / (float)system_clock));
+
   /* Clear RAM */
   memset(scd.prg_ram, 0x00, sizeof(scd.prg_ram));
   memset(scd.word_ram, 0x00, sizeof(scd.word_ram));
diff --git a/core/loadrom.c b/core/loadrom.c
index 793b911..48bb270 100644
--- a/core/loadrom.c
+++ b/core/loadrom.c
@@ -1105,12 +1105,6 @@ void get_region(char *romheader)
   /* force PAL/NTSC master clock if requested */
   if (config.master_clock == 1) system_clock = MCLOCK_NTSC;
   else if (config.master_clock == 2) system_clock = MCLOCK_PAL;
-
-  /* reinitialize CD unit master clock count per scanline */
-  if (system_hw == SYSTEM_MCD)
-  {
-    scd.cycles_per_line = (uint32) (MCYCLES_PER_LINE * ((float)SCD_CLOCK / (float)system_clock));
-  }
 }
 
 /****************************************************************************