diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
index 0f8dec5..70da4c8 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java
@@ -137,7 +137,7 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
                 if (newValue.equals(value)) {
                     newValue = invertNumber(value);
                 }
-            } else if (!key.startsWith("name") && !key.endsWith("name")) {
+            } else if (!ignoreKeyForPrefixSuffixCorrection(key)) {
                 for (PrefixSuffixSwitcher prefixSuffixSwitcher : prefixSuffixSwitchers) {
                     newKey = prefixSuffixSwitcher.apply(key);
                     if (!key.equals(newKey)) {
@@ -210,4 +210,9 @@ public class ReverseWayTagCorrector extends TagCorrector<Way> {
                         + "of the way and its nodes are suggested in order "
                         + "to maintain data consistency."));
     }
+
+    private static boolean ignoreKeyForPrefixSuffixCorrection(String key) {
+        return key.startsWith("name") || key.endsWith("name")
+                || key.equalsIgnoreCase("fixme") || key.startsWith("note");
+    }
 }