diff --git a/columnar/src/column/serialize.rs b/columnar/src/column/serialize.rs
index 9edfedd4c..97ea3e3f8 100644
--- a/columnar/src/column/serialize.rs
+++ b/columnar/src/column/serialize.rs
@@ -15,10 +15,6 @@ use crate::column_values::{
 use crate::iterable::Iterable;
 use crate::{StrColumn, Version};
 
-fn shift_u32_to_i64(value: u32) -> i64 {
-    i64::from(value) + i64::from(i32::MIN)
-}
-
 pub fn serialize_column_mappable_to_u128<T: MonotonicallyMappableToU128>(
     column_index: SerializableColumnIndex<'_>,
     iterable: &dyn Iterable<T>,
@@ -34,9 +30,8 @@ pub(crate) fn serialize_generated_tie_breaker_column(
     num_docs: u32,
     output: &mut impl Write,
 ) -> io::Result<()> {
-    let max_start = u32::MAX - num_docs;
-    let unsigned_start: u32 = rand::rng().random_range(0..=max_start);
-    let start = shift_u32_to_i64(unsigned_start);
+    let max_start = i64::from(i32::MAX) - i64::from(num_docs.saturating_sub(1));
+    let start = rand::rng().random_range(i64::from(i32::MIN)..=max_start);
     let end = start + i64::from(num_docs);
     let values = start..end;
     let column_index_num_bytes = serialize_column_index(SerializableColumnIndex::Full, output)?;
@@ -53,18 +48,6 @@ pub(crate) fn serialize_generated_tie_breaker_column(
     Ok(())
 }
 
-#[cfg(test)]
-mod tests {
-    use super::shift_u32_to_i64;
-
-    #[test]
-    fn test_shift_u32_to_i64_covers_i32_range() {
-        assert_eq!(shift_u32_to_i64(u32::MIN), i64::from(i32::MIN));
-        assert_eq!(shift_u32_to_i64(1 << 31), 0);
-        assert_eq!(shift_u32_to_i64(u32::MAX), i64::from(i32::MAX));
-    }
-}
-
 pub fn serialize_column_mappable_to_u64<T: MonotonicallyMappableToU64>(
     column_index: SerializableColumnIndex<'_>,
     column_values: &impl Iterable<T>,
diff --git a/src/query/query_parser/query_parser.rs b/src/query/query_parser/query_parser.rs
index 05ade3670..ba9f1a25b 100644
--- a/src/query/query_parser/query_parser.rs
+++ b/src/query/query_parser/query_parser.rs
@@ -457,7 +457,7 @@ impl QueryParser {
                 let val: u64 = u64::from_str(phrase)?;
                 Ok(Term::from_field_u64(field, val))
             }
-            FieldType::TieBreaker | FieldType::I64(_) => {
+            FieldType::I64(_) | FieldType::TieBreaker => {
                 let val: i64 = i64::from_str(phrase)?;
                 Ok(Term::from_field_i64(field, val))
             }
diff --git a/src/schema/field_type.rs b/src/schema/field_type.rs
index 0f500092d..43b1f3e29 100644
--- a/src/schema/field_type.rs
+++ b/src/schema/field_type.rs
@@ -222,7 +222,7 @@ impl FieldType {
         match *self {
             FieldType::Str(_) => Type::Str,
             FieldType::U64(_) => Type::U64,
-            FieldType::TieBreaker | FieldType::I64(_) => Type::I64,
+            FieldType::I64(_) | FieldType::TieBreaker => Type::I64,
             FieldType::F64(_) => Type::F64,
             FieldType::Bool(_) => Type::Bool,
             FieldType::Date(_) => Type::Date,