diff --git a/src/main/java/de/ids_mannheim/korap/response/Match.java b/src/main/java/de/ids_mannheim/korap/response/Match.java
index c5ab6ab..9a70922 100644
--- a/src/main/java/de/ids_mannheim/korap/response/Match.java
+++ b/src/main/java/de/ids_mannheim/korap/response/Match.java
@@ -2494,11 +2494,11 @@
             // Legacy flat field support
             String mfs = mf.key;
             String value = this.getFieldValue(mfs);
-            if (value != null)
+            if (value != null && !json.has(mfs))
                 json.set(mfs, new TextNode(value));
 		};
 
-        this.addMessage(0, "Support for flat field values is eprecated");
+        this.addMessage(0, "Support for flat field values is deprecated");
         
         return json;
     };
diff --git a/src/main/java/de/ids_mannheim/korap/response/Text.java b/src/main/java/de/ids_mannheim/korap/response/Text.java
index 68dab3c..dc77603 100644
--- a/src/main/java/de/ids_mannheim/korap/response/Text.java
+++ b/src/main/java/de/ids_mannheim/korap/response/Text.java
@@ -55,11 +55,11 @@
             // Legacy flat field support
             String mfs = mf.key;
             String value = this.getFieldValue(mfs);
-            if (value != null)
+            if (value != null && !json.has(mfs))
                 json.set(mfs, new TextNode(value));
 		};
 
-        this.addMessage(0, "Support for flat field values is eprecated");
+        this.addMessage(0, "Support for flat field values is deprecated");
 
         
         // Match was no match