diff --git a/firmware/controllers/math/engine_math.cpp b/firmware/controllers/math/engine_math.cpp
index 08642b3799..158ec2b36a 100644
--- a/firmware/controllers/math/engine_math.cpp
+++ b/firmware/controllers/math/engine_math.cpp
@@ -511,7 +511,7 @@ void prepareOutputSignals(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 #if EFI_UNIT_TEST
 	printf("prepareOutputSignals %d onlyEdge=%s %s\r\n", engineConfiguration->trigger.type, boolToString(engineConfiguration->useOnlyRisingEdgeForTrigger),
 			getIgnition_mode_e(engineConfiguration->ignitionMode));
-#endif
+#endif /* EFI_UNIT_TEST */
 
 	for (int i = 0; i < CONFIG(specs.cylindersCount); i++) {
 		ENGINE(angleExtra[i])= ENGINE(engineCycle) * i / CONFIG(specs.cylindersCount);
diff --git a/firmware/controllers/trigger/rpm_calculator.cpp b/firmware/controllers/trigger/rpm_calculator.cpp
index 11f7c54800..a0dec8c0ad 100644
--- a/firmware/controllers/trigger/rpm_calculator.cpp
+++ b/firmware/controllers/trigger/rpm_calculator.cpp
@@ -53,8 +53,10 @@ RpmCalculator::RpmCalculator() {
 #if !EFI_PROD_CODE
 	mockRpm = MOCK_UNDEFINED;
 #endif /* EFI_PROD_CODE */
-	rpmValue = 0;
-	assignRpmValue(0 PASS_ENGINE_PARAMETER_SUFFIX);
+	// todo: reuse assignRpmValue() method which needs PASS_ENGINE_PARAMETER_SUFFIX
+	// which we cannot provide inside this parameter-less consutructor. need a solution for this minor mess
+	previousRpmValue = rpmValue = 0;
+	oneDegreeUs = NAN;
 	state = STOPPED;
 
 	// we need this initial to have not_running at first invocation