diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 0bbc98faf5..21ca2d5e4d 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -273,16 +273,17 @@ extern bool kAcRequestState;
 }
 
 Engine::Engine()
+    : clutchUpSwitchedState(&engineState.clutchUpState),
+	brakePedalSwitchedState(&engineState.brakePedalState),
+	acButtonSwitchedState(&module<AcController>().unmock().acButtonState)
+
 #if EFI_LAUNCH_CONTROL
 
-	: softSparkLimiter(false), hardSparkLimiter(true)
+	, softSparkLimiter(false), hardSparkLimiter(true)
 
 #if EFI_ANTILAG_SYSTEM
 	, ALSsoftSparkLimiter(false)
 #endif /* EFI_ANTILAG_SYSTEM */
-	, clutchUpSwitchedState(&engineState.clutchUpState)
-	, brakePedalSwitchedState(&engineState.brakePedalState)
-	, acButtonSwitchedState(&module<AcController>().unmock().acButtonState)
 
 #endif // EFI_LAUNCH_CONTROL
 {
diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 0f39d879da..0bd6d939c9 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -169,7 +169,11 @@ public:
 #if EFI_TCU
 	GearControllerBase *gearController;
 #endif
-	
+
+	SwitchedState clutchUpSwitchedState;
+   	SwitchedState brakePedalSwitchedState;
+   	SwitchedState acButtonSwitchedState;
+
 #if EFI_LAUNCH_CONTROL
 	LaunchControlBase launchController;
 	SoftSparkLimiter softSparkLimiter;
@@ -338,10 +342,6 @@ public:
 	AirmassModelBase* mockAirmassModel = nullptr;
 #endif
 
-	SwitchedState clutchUpSwitchedState;
-	SwitchedState brakePedalSwitchedState;
-	SwitchedState acButtonSwitchedState;
-
 private:
 	void reset();