diff --git a/firmware/development/engine_sniffer.cpp b/firmware/development/engine_sniffer.cpp
index 87c93d5803..9f78b16ccb 100644
--- a/firmware/development/engine_sniffer.cpp
+++ b/firmware/development/engine_sniffer.cpp
@@ -103,7 +103,7 @@ bool WaveChart::isStartedTooLongAgo() {
 }
 
 bool WaveChart::isFull() {
-	return counter >= engineConfiguration->engineChartSize;
+	return counter >= CONFIG(engineChartSize);
 }
 
 static void printStatus(void) {
@@ -165,7 +165,7 @@ static char timeBuffer[10];
  * @brief	Register an event for digital sniffer
  */
 void WaveChart::addEvent3(const char *name, const char * msg) {
-	if (skipUntilEngineCycle != 0 && engine->rpmCalculator.getRevolutionCounter() < skipUntilEngineCycle)
+	if (skipUntilEngineCycle != 0 && ENGINE(rpmCalculator.getRevolutionCounter()) < skipUntilEngineCycle)
 		return;
 	efiAssertVoid(name!=NULL, "WC: NULL name");
 	if (!ENGINE(isEngineChartEnabled)) {