diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java b/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java
index aa05f92284..c5908a241d 100644
--- a/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java
+++ b/java_tools/enum_to_string/src/com/rusefi/EnumToStringTest.java
@@ -40,7 +40,7 @@ public class EnumToStringTest {
                         "\tGPIO_UNASSIGNED = 0,\n" +
                         "\tGPIO_INVALID = 1,\n" +
                         "\tGPIO_HEX = 0xA1,\n" +
-                        "}brain_pin_e;"));
+                        "}brain_pin_e; // hello"));
 
         List<Value> values = new ArrayList<>(enumsReader.getEnums().get("brain_pin_e").values());
         assertEquals(3, values.size());
diff --git a/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java b/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java
index bd4c3c4fab..aad2dcfa50 100644
--- a/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java
+++ b/java_tools/enum_to_string/src/com/rusefi/EnumsReader.java
@@ -12,6 +12,10 @@ public class EnumsReader {
 
     private final Map<String, Map<String, Value>> enums = new TreeMap<>();
 
+    public Map<String /*enum name*/, Map<String/*enum member*/, Value>> getEnums() {
+        return enums;
+    }
+
     public void process(String path, String fileName) throws IOException {
         process(new FileReader(path + File.separator + fileName));
     }
@@ -23,6 +27,7 @@ public class EnumsReader {
         while ((line = reader.readLine()) != null) {
             line = removeSpaces(line);
 
+            line = line.replaceAll("//.+", "");
             if (line.startsWith("typedefenum{") || line.startsWith("typedefenum__attribute__")) {
                 SystemOut.println("  EnumsReader: Entering enum");
                 currentValues.clear();
@@ -33,7 +38,6 @@ public class EnumsReader {
                 SystemOut.println("  EnumsReader: Ending enum " + line  + " found " + currentValues.size() + " values");
                 enums.put(line, new TreeMap<>(currentValues));
             } else {
-                line = line.replaceAll("//.+", "");
                 if (isInsideEnum) {
                     if (isKeyValueLine(line)) {
                         line = line.replace(",", "");
@@ -53,11 +57,7 @@ public class EnumsReader {
         }
     }
 
-    public Map<String, Map<String, Value>> getEnums() {
-        return enums;
-    }
-
-    static String removeSpaces(String line) {
+    private static String removeSpaces(String line) {
         return line.replaceAll("\\s+", "");
     }