diff --git a/src/core/segment_reader.rs b/src/core/segment_reader.rs
index ea003754c..2a45861d2 100644
--- a/src/core/segment_reader.rs
+++ b/src/core/segment_reader.rs
@@ -178,9 +178,9 @@ impl SegmentReader {
 
         let fast_fields_data = segment.open_read(SegmentComponent::FASTFIELDS)?;
         let fast_fields_composite = CompositeFile::open(&fast_fields_data)?;
-        let fast_field_readers = Arc::new(FastFieldReaders::load_all(
+        let fast_field_readers = Arc::new(FastFieldReaders::new(
             schema.clone(),
-            &fast_fields_composite,
+            fast_fields_composite,
         )?);
 
         let fieldnorm_data = segment.open_read(SegmentComponent::FIELDNORMS)?;
diff --git a/src/fastfield/mod.rs b/src/fastfield/mod.rs
index 8f1109863..e0667d57f 100644
--- a/src/fastfield/mod.rs
+++ b/src/fastfield/mod.rs
@@ -28,7 +28,7 @@ pub use self::delete::write_delete_bitset;
 pub use self::delete::DeleteBitSet;
 pub use self::error::{FastFieldNotAvailableError, Result};
 pub use self::facet_reader::FacetReader;
-pub use self::multivalued::{MultiValueIntFastFieldWriter, MultiValuedFastFieldReader};
+pub use self::multivalued::{MultiValuedFastFieldReader, MultiValueIntFastFieldWriter};
 pub use self::reader::FastFieldReader;
 pub use self::readers::FastFieldReaders;
 pub use self::serializer::FastFieldSerializer;
diff --git a/src/fastfield/readers.rs b/src/fastfield/readers.rs
index d537dabfb..df870daaf 100644
--- a/src/fastfield/readers.rs
+++ b/src/fastfield/readers.rs
@@ -43,13 +43,13 @@ fn type_and_cardinality(field_type: &FieldType) -> Option<(FastType, Cardinality
 }
 
 impl FastFieldReaders {
-    pub(crate) fn load_all(
+    pub(crate) fn new(
         schema: Schema,
-        fast_fields_composite: &CompositeFile,
+        fast_fields_composite: CompositeFile,
     ) -> crate::Result<FastFieldReaders> {
         Ok(FastFieldReaders {
-            fast_fields_composite: fast_fields_composite.clone(),
-            schema: schema.clone(),
+            fast_fields_composite,
+            schema,
         })
     }