diff --git a/src/loadCsv.ts b/src/loadCsv.ts
index aaab508..b1f1411 100644
--- a/src/loadCsv.ts
+++ b/src/loadCsv.ts
@@ -35,9 +35,11 @@ const loadCsv = (filename: string, options: CsvReadOptions) => {
           })
     );
 
+  const mappedData = applyMappings(data, mappings);
+
   const tables: { [key: string]: CsvTable } = {
-    labels: filterColumns(data, labelColumns),
-    features: filterColumns(data, featureColumns),
+    labels: filterColumns(mappedData, labelColumns),
+    features: filterColumns(mappedData, featureColumns),
     testFeatures: [],
     testLabels: [],
   };
@@ -45,10 +47,6 @@ const loadCsv = (filename: string, options: CsvReadOptions) => {
   tables.labels.shift();
   tables.features.shift();
 
-  for (const key of Object.keys(tables)) {
-    tables[key] = applyMappings(tables[key], mappings);
-  }
-
   if (shouldShuffle) {
     const seed =
       typeof shouldShuffle === 'string' ? shouldShuffle : defaultShuffleSeed;