diff --git a/src/emu/sound/multipcm.c b/src/emu/sound/multipcm.c
index 046cd0f5af31f..b5524f1265366 100644
--- a/src/emu/sound/multipcm.c
+++ b/src/emu/sound/multipcm.c
@@ -390,7 +390,7 @@ multipcm_device::multipcm_device(const machine_config &mconfig, const char *tag,
 	: device_t(mconfig, MULTIPCM, "Sega/Yamaha 315-5560", tag, owner, clock, "multipcm", __FILE__),
 		device_sound_interface(mconfig, *this),
 		device_memory_interface(mconfig, *this),
-		m_space_config("mpcm_samples", ENDIANNESS_LITTLE, 8, 24, 0, NULL, *ADDRESS_MAP_NAME(multipcm)),
+		m_space_config("mpcm_samples", ENDIANNESS_LITTLE, 8, 24, 0, NULL),
 		m_stream(NULL),
 		//m_Samples(0x200),
 		//m_Slots[28],
@@ -403,6 +403,7 @@ multipcm_device::multipcm_device(const machine_config &mconfig, const char *tag,
 		//m_DRStep(0),
 		//m_FNS_Table(0)
 {
+	m_address_map[0] = *ADDRESS_MAP_NAME(multipcm);
 }
 
 //-------------------------------------------------
diff --git a/src/mame/audio/segam1audio.c b/src/mame/audio/segam1audio.c
index 5a36f98dfae95..3e66f4e09f4f2 100644
--- a/src/mame/audio/segam1audio.c
+++ b/src/mame/audio/segam1audio.c
@@ -20,7 +20,7 @@ static ADDRESS_MAP_START( segam1audio_map, AS_PROGRAM, 16, segam1audio_device )
 	AM_RANGE(0xc40000, 0xc40007) AM_DEVREADWRITE8(MULTIPCM_1_TAG, multipcm_device, read, write, 0x00ff )
 	AM_RANGE(0xc40012, 0xc40013) AM_WRITENOP
 	AM_RANGE(0xc50000, 0xc50001) AM_WRITE(m1_snd_mpcm_bnk1_w )
-	AM_RANGE(0xc60000, 0xc60007) AM_DEVREADWRITE8(MULTIPCM_1_TAG, multipcm_device, read, write, 0x00ff )
+	AM_RANGE(0xc60000, 0xc60007) AM_DEVREADWRITE8(MULTIPCM_2_TAG, multipcm_device, read, write, 0x00ff )
 	AM_RANGE(0xc70000, 0xc70001) AM_WRITE(m1_snd_mpcm_bnk2_w )
 	AM_RANGE(0xd00000, 0xd00007) AM_DEVREADWRITE8(YM3438_TAG, ym3438_device, read, write, 0x00ff )
 	AM_RANGE(0xf00000, 0xf0ffff) AM_RAM