diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c
index d9a03e1..cf3cf4d 100644
--- a/right/src/slave_scheduler.c
+++ b/right/src/slave_scheduler.c
@@ -57,8 +57,9 @@ void InitSlaveScheduler()
     currentSlaveId = 0;
 
     for (uint8_t i=0; i<sizeof(Slaves) / sizeof(uhk_slave_t); i++) {
-        Slaves[i].isConnected = false;
-        Slaves[i].init(Slaves[i].perDriverId);
+        uhk_slave_t *currentSlave = Slaves + i;
+        currentSlave->isConnected = false;
+        currentSlave->init(currentSlave->perDriverId);
     }
 
     I2C_MasterTransferCreateHandle(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, masterCallback, NULL);