diff --git a/firmware/controllers/settings.cpp b/firmware/controllers/settings.cpp
index 0c470e63e4..3efde3fb62 100644
--- a/firmware/controllers/settings.cpp
+++ b/firmware/controllers/settings.cpp
@@ -893,7 +893,7 @@ static plain_get_float_s getF_plain[] = {
 
 static plain_get_float_s * findFloat2(const char *name) {
 	plain_get_float_s *currentF = &getF_plain[0];
-	while (currentF < getF_plain + sizeof(getF_plain)/sizeof(getF_plain[0])) {
+	while (currentF < getF_plain + efi::size(getF_plain)) {
 		if (strEqualCaseInsensitive(name, currentF->token)) {
 			return currentF;
 		}
@@ -904,7 +904,7 @@ static plain_get_float_s * findFloat2(const char *name) {
 
 static plain_get_integer_s *findInt(const char *name) {
 	plain_get_integer_s *currentI = &getI_plain[0];
-	while (currentI < getI_plain + sizeof(getI_plain)/sizeof(getI_plain[0])) {
+	while (currentI < getI_plain + efi::size(getI_plain)) {
 		if (strEqualCaseInsensitive(name, currentI->token)) {
 			return currentI;
 		}
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java
index 2177551ebb..88b27495d3 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/GetConfigValueConsumer.java
@@ -22,7 +22,7 @@ public class GetConfigValueConsumer implements ConfigurationConsumer {
     private static final String FIND_METHOD =
             "plain_get_float_s * findFloat(const char *name) {\n" +
             "\tplain_get_float_s *currentF = &getF_plain[0];\n" +
-            "\twhile (currentF < getF_plain + sizeof(getF_plain)/sizeof(getF_plain[0])) {\n" +
+            "\twhile (currentF < getF_plain + efi::size(getF_plain)) {\n" +
             "\t\tif (strEqualCaseInsensitive(name, currentF->token)) {\n" +
             "\t\t\treturn currentF;\n" +
             "\t\t}\n" +
diff --git a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java
index 53247cc4c5..895cf0a455 100644
--- a/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java
+++ b/java_tools/configuration_definition/src/test/java/com/rusefi/test/GetConfigValueConsumerTest.java
@@ -155,7 +155,7 @@ public class GetConfigValueConsumerTest {
                 "\n" +
                 "plain_get_float_s * findFloat(const char *name) {\n" +
                 "\tplain_get_float_s *currentF = &getF_plain[0];\n" +
-                "\twhile (currentF < getF_plain + sizeof(getF_plain)/sizeof(getF_plain[0])) {\n" +
+                "\twhile (currentF < getF_plain + efi::size(getF_plain)) {\n" +
                 "\t\tif (strEqualCaseInsensitive(name, currentF->token)) {\n" +
                 "\t\t\treturn currentF;\n" +
                 "\t\t}\n" +