diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c
index ff213ab..e509d1b 100644
--- a/right/src/usb_protocol_handler.c
+++ b/right/src/usb_protocol_handler.c
@@ -80,7 +80,7 @@ void setTestLed(void)
 {
     uint8_t ledState = GenericHidInBuffer[1];
     TEST_LED_SET(ledState);
-    UhkModuleStates[0].sourceVars.isTestLedOn = ledState;
+    UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].sourceVars.isTestLedOn = ledState;
 }
 
 // To be removed. Now it's already part of getKeyboardState()
@@ -147,7 +147,7 @@ void setLedPwm(void)
 {
     uint8_t brightnessPercent = GenericHidInBuffer[1];
     LedPwm_SetBrightness(brightnessPercent);
-    UhkModuleStates[0].sourceVars.ledPwmBrightness = brightnessPercent;
+    UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].sourceVars.ledPwmBrightness = brightnessPercent;
 }
 
 void getAdcValue(void)