diff --git a/src/RIGv2/Actuators/Actuators.cpp b/src/RIGv2/Actuators/Actuators.cpp
index 6f2f570b529ad4d884e56f5557e12fd87a59caff..e511cdb1758809e91f268d8c4694cdd2a0ca1c7d 100644
--- a/src/RIGv2/Actuators/Actuators.cpp
+++ b/src/RIGv2/Actuators/Actuators.cpp
@@ -371,19 +371,19 @@ Actuators::ServoInfo* Actuators::getServo(ServosList servo)
         case OX_DETACH_SERVO:  // OX_DET
             return &infos[2];
         case N2_FILLING_VALVE:  // N2_FIL
-            return &infos[4];
+            return &infos[3];
         case N2_RELEASE_VALVE:  // N2_REL
-            return &infos[5];
+            return &infos[4];
         case N2_DETACH_SERVO:  // N2_DET
-            return &infos[6];
+            return &infos[5];
         case NITROGEN_VALVE:  // NITR
-            return &infos[7];
+            return &infos[6];
         case OX_VENTING_VALVE:  // OX_VEN
-            return &infos[8];
+            return &infos[7];
         case N2_QUENCHING_VALVE:  // N2_QUE
-            return &infos[9];
+            return &infos[8];
         case MAIN_VALVE:  // MAIN
-            return &infos[10];
+            return &infos[9];
 
         default:
             // Oh FUCK
diff --git a/src/RIGv2/Actuators/Actuators.h b/src/RIGv2/Actuators/Actuators.h
index 0289b1a7812906c4e7925c55a602085917b7266c..2877fa68e367332956dba5c591762b03fac0fc0a 100644
--- a/src/RIGv2/Actuators/Actuators.h
+++ b/src/RIGv2/Actuators/Actuators.h
@@ -132,7 +132,7 @@ private:
     std::atomic<bool> started{false};
 
     miosix::FastMutex infosMutex;
-    ServoInfo infos[10];
+    std::array<ServoInfo, 10> infos;
     ServoInfo n2_3wayValveInfo;
 
     long long chamberCloseTs =