diff --git a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
index 9c010a427..f573da54c 100644
--- a/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
+++ b/spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
@@ -282,9 +282,7 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
 			}
 		}
 
-		if (!propertiesMatched.containsKey(distanceKey)) {
-			propertiesMatched.putIfAbsent(distanceKey, new ConcurrentHashMap<String, String>(matches));
-		}
+		propertiesMatched.replace(distanceKey, new ConcurrentHashMap<String, String>(matches));
 		return properties;
 	}