diff --git a/dynamixel_base/include/dynamixel_slave_registers.h b/dynamixel_base/include/dynamixel_slave_registers.h
index 40f60b49385636e2d818fc5562af66efefb639b8..acc7a81e59f6faf61c64bb19cebad247fec72914 100644
--- a/dynamixel_base/include/dynamixel_slave_registers.h
+++ b/dynamixel_base/include/dynamixel_slave_registers.h
@@ -15,13 +15,13 @@
 
 #define dyn_slave_control_eeprom_data(name,section_name,base_address1,base_address2,DEFAULT_DEVICE_MODEL,DEFAULT_FIRMWARE_VERSION,DEFAULT_DEVICE_ID,DEFAULT_BAUDRATE,DEFAULT_RETURN_DELAY,DEFAULT_RETURN_LEVEL) \
 unsigned short int name##_eeprom_data[] __attribute__ ((section (section_name))) __attribute__ ((aligned (4)))= {\
-  DEFAULT_DEVICE_MODEL&0x00FF,base_address1+DEVICE_MODEL, \
-  (DEFAULT_DEVICE_MODEL>>8)&0x00FF,base_address1+DEVICE_MODEL+1, \
-  DEFAULT_FIRMWARE_VERSION,base_address1+FIRMWARE_VERSION, \
-  DEFAULT_DEVICE_ID,base_address1+DEVICE_ID, \
-  DEFAULT_BAUDRATE,base_address1+BAUDRATE, \
-  DEFAULT_RETURN_DELAY,base_address1+RETURN_DELAY, \
-  DEFAULT_RETURN_LEVEL,base_address2+RETURN_LEVEL \
+  DEFAULT_DEVICE_MODEL&0x00FF,(DEFAULT_DEVICE_ID<<8)+base_address1+DEVICE_MODEL, \
+  (DEFAULT_DEVICE_MODEL>>8)&0x00FF,(DEFAULT_DEVICE_ID<<8)+base_address1+DEVICE_MODEL+1, \
+  DEFAULT_FIRMWARE_VERSION,(DEFAULT_DEVICE_ID<<8)+base_address1+FIRMWARE_VERSION, \
+  DEFAULT_DEVICE_ID,(DEFAULT_DEVICE_ID<<8)+base_address1+DEVICE_ID, \
+  DEFAULT_BAUDRATE,(DEFAULT_DEVICE_ID<<8)+base_address1+BAUDRATE, \
+  DEFAULT_RETURN_DELAY,(DEFAULT_DEVICE_ID<<8)+base_address1+RETURN_DELAY, \
+  DEFAULT_RETURN_LEVEL,(DEFAULT_DEVICE_ID<<8)+base_address2+RETURN_LEVEL \
 };