diff --git a/java_tools/gcc_map_reader.jar b/java_tools/gcc_map_reader.jar
index 0cf6d84122..afb66811b5 100644
Binary files a/java_tools/gcc_map_reader.jar and b/java_tools/gcc_map_reader.jar differ
diff --git a/java_tools/gcc_map_reader/lib/junit.jar b/java_tools/gcc_map_reader/lib/junit.jar
new file mode 100644
index 0000000000..5b4bb849af
Binary files /dev/null and b/java_tools/gcc_map_reader/lib/junit.jar differ
diff --git a/java_tools/gcc_map_reader/src/rusefi/GccMapReader.java b/java_tools/gcc_map_reader/src/rusefi/GccMapReader.java
index 2f65214a5c..13f8d759f3 100644
--- a/java_tools/gcc_map_reader/src/rusefi/GccMapReader.java
+++ b/java_tools/gcc_map_reader/src/rusefi/GccMapReader.java
@@ -54,7 +54,7 @@ public class GccMapReader {
             String line = lines.get(i);
             if (!line.contains(".bss."))
                 continue;
-            debug(line);
+            debug("Got: " + line);
 
             Matcher m1 = SINGLE_LINE_PATTERN.matcher(line);
 
@@ -75,8 +75,8 @@ public class GccMapReader {
         Matcher m2 = MULTI_LINE_PATTERN.matcher(line);
 
         if (!m2.matches()) {
-            debug("Skipping " + line);
-            return lineIndex;
+            debug("Returning into consideration: " + line);
+            return lineIndex - 1;
         }
 
         String sizeString = m2.group(1);
diff --git a/java_tools/gcc_map_reader/src/rusefi/GccMapReaderTest.java b/java_tools/gcc_map_reader/src/rusefi/GccMapReaderTest.java
index e0bf44e890..f2f2651c25 100644
--- a/java_tools/gcc_map_reader/src/rusefi/GccMapReaderTest.java
+++ b/java_tools/gcc_map_reader/src/rusefi/GccMapReaderTest.java
@@ -53,7 +53,8 @@ public class GccMapReaderTest {
                 " .bss.ch        0x1fff9320       0x80 build_kinetis/obj/chschd.o",
                 "                0x1fff9320                ch"));
         assertNotNull(r);
-        assertEquals(1, r.size());
-        assertEquals(0x80, r.get(0).getSize());
+        assertEquals(2, r.size());
+        assertEquals(0x610, r.get(0).getSize());
+        assertEquals(0x80, r.get(1).getSize());
     }
 }