diff --git a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java
index 1356f05b3..78988879f 100644
--- a/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java
+++ b/spring-batch-samples/src/main/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapper.java
@@ -32,10 +32,10 @@ public class TradeFieldSetMapper implements FieldSetMapper<Trade> {
     public Trade mapLine(FieldSet fieldSet, int lineNum) {
     	
     	Trade trade = new Trade();
-    	trade.setIsin(fieldSet.readString(0));
-        trade.setQuantity(fieldSet.readLong(1));
-        trade.setPrice(fieldSet.readBigDecimal(2));
-        trade.setCustomer(fieldSet.readString(3));
+    	trade.setIsin(fieldSet.readString(ISIN_COLUMN));
+        trade.setQuantity(fieldSet.readLong(QUANTITY_COLUMN));
+        trade.setPrice(fieldSet.readBigDecimal(PRICE_COLUMN));
+        trade.setCustomer(fieldSet.readString(CUSTOMER_COLUMN));
         
         return trade;
     }
diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java
index 10b341523..908480d8f 100644
--- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java
+++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/domain/trade/internal/TradeFieldSetMapperTests.java
@@ -38,7 +38,6 @@ public class TradeFieldSetMapperTests extends AbstractFieldSetMapperTests {
 	}
 
 	protected FieldSetMapper<Trade> fieldSetMapper() {
-		@SuppressWarnings("unchecked")
 		FieldSetMapper<Trade> mapper = new TradeFieldSetMapper();
 		return mapper;
 	}