diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7552b2e..8619ac1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -27,7 +27,7 @@ assignees: ''
 > _Please complete the following information._
  - OS: [e.g. Windows 10]
  - Java version: [e.g. 1.8]
- - i-Code version: [e.g. 3.1.0]
+ - i-Code version: [e.g. 3.1.1]
  - Plugin version: [e.g. 2.0.0]
 
 #### Additional context
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 6615ec8..75b6c1c 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -19,7 +19,7 @@ assignees: ''
 > _Please complete the following information._
  - OS: [e.g. Windows 10]
  - Java version: [e.g. 1.8]
- - i-Code version: [e.g. 3.1.0]
+ - i-Code version: [e.g. 3.1.1]
  - Plugin version: [e.g. 2.0.0]
 
 #### Additional context
diff --git a/README.md b/README.md
index f0c4ddc..de9cb5d 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,7 @@ Here is the compatibility matrix of the plugin:
 |        3.0.0       |          4.1.0          |        7.9 -> 8.2           |       Fortran       |
 |        3.0.1       |          4.1.2          |        7.9 -> 8.2           |       Fortran       |
 |        3.1.0       |          4.1.2          |        7.9 -> 9.9           |       Fortran       |
+|        3.1.1       |          4.1.2          |        7.9 -> 9.9           |       Fortran       |
 
 #### Run i-Code manually
 If you need help to run i-Code please refer to the [official user manual](https://github.com/cnescatlab/i-CodeCNES/wiki/User-Manual) or [i-Code issue tracker](https://github.com/cnescatlab/i-CodeCNES/issues).
diff --git a/pom.xml b/pom.xml
index c885d2e..f94c4f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>fr.cnes.sonar.plugins</groupId>
     <artifactId>sonar-icode-cnes-plugin</artifactId>
     <packaging>sonar-plugin</packaging>
-    <version>3.1.0</version>
+    <version>3.1.1</version>
 
     <name>Sonar i-Code CNES plugin</name>
 
diff --git a/src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java b/src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java
index 23383d5..6a48c17 100644
--- a/src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java
+++ b/src/main/java/fr/cnes/sonar/plugins/icode/measures/ICodeMetricsProcessor.java
@@ -79,8 +79,11 @@ public static void saveMeasure(final SensorContext context, final Map<String, In
             // Get i-Code rule id to test if issue must be saved here.
             final String metricKey = icodeMeasure.getAnalysisRuleId();
             // Take F77 / F90 ncloc and number of comment lines into account
-            if (metricKey.contains("MET.Line")) {
+            if (metricKey.contains("MET.LineOfCode")) {
                 saveSonarQubeNewMeasure(context, files, CoreMetrics.NCLOC, icodeMeasure);
+            }
+            // Take F77 / F90 number of comment lines into account
+            else if (metricKey.contains("MET.LineOfComment")) {
                 saveSonarQubeNewMeasure(context, files, CoreMetrics.COMMENT_LINES, icodeMeasure);
             }
         }