diff --git a/src/mame/machine/kaneko16.c b/src/mame/machine/kaneko16.c
index 3e00e7036c1..6d27c25e3a6 100644
--- a/src/mame/machine/kaneko16.c
+++ b/src/mame/machine/kaneko16.c
@@ -1814,7 +1814,7 @@ static int calc3_decompress_table(running_machine* machine, int tabnum, UINT8* d
 					//printf("save to eeprom\n");
 
 					{
-						const address_space *eeprom_space = cputag_get_address_space(space->machine, "eeprom", ADDRESS_SPACE_0);
+						const address_space *eeprom_space = space->machine->device<eeprom_device>("eeprom")->space();
 
 						for (i=0;i<0x80;i++)
 						{
@@ -2164,7 +2164,7 @@ void calc3_mcu_run(running_machine *machine)
             */
 
 			{
-				const address_space *eeprom_space = cputag_get_address_space(space->machine, "eeprom", ADDRESS_SPACE_0);
+				const address_space *eeprom_space = space->machine->device<eeprom_device>("eeprom")->space();
 
 				for (i=0;i<0x80;i++)
 				{