diff --git a/src/core/json_utils.rs b/src/core/json_utils.rs
index b4459b066..749045ea0 100644
--- a/src/core/json_utils.rs
+++ b/src/core/json_utils.rs
@@ -130,10 +130,10 @@ fn index_json_value(
             postings_writer.subscribe(doc, 0u32, json_term_writer.term(), ctx);
         }
         serde_json::Value::Number(number) => {
-            if let Some(number_u64) = number.as_u64() {
-                json_term_writer.set_fast_value(number_u64);
-            } else if let Some(number_i64) = number.as_i64() {
+            if let Some(number_i64) = number.as_i64() {
                 json_term_writer.set_fast_value(number_i64);
+            } else if let Some(number_u64) = number.as_u64() {
+                json_term_writer.set_fast_value(number_u64);
             } else if let Some(number_f64) = number.as_f64() {
                 json_term_writer.set_fast_value(number_f64);
             }
diff --git a/src/indexer/segment_writer.rs b/src/indexer/segment_writer.rs
index e4a8d9afc..f97908cff 100644
--- a/src/indexer/segment_writer.rs
+++ b/src/indexer/segment_writer.rs
@@ -556,7 +556,7 @@ mod tests {
         json_term_writer.pop_path_segment();
         json_term_writer.push_path_segment("complexobject");
         json_term_writer.push_path_segment("field.with.dot");
-        json_term_writer.set_fast_value(1u64);
+        json_term_writer.set_fast_value(1i64);
         assert!(term_stream.advance());
         assert_eq!(term_stream.key(), json_term_writer.term().value_bytes());
 
@@ -577,15 +577,15 @@ mod tests {
 
         json_term_writer.pop_path_segment();
         json_term_writer.push_path_segment("my_arr");
-        json_term_writer.set_fast_value(2u64);
+        json_term_writer.set_fast_value(2i64);
         assert!(term_stream.advance());
         assert_eq!(term_stream.key(), json_term_writer.term().value_bytes());
 
-        json_term_writer.set_fast_value(3u64);
+        json_term_writer.set_fast_value(3i64);
         assert!(term_stream.advance());
         assert_eq!(term_stream.key(), json_term_writer.term().value_bytes());
 
-        json_term_writer.set_fast_value(4u64);
+        json_term_writer.set_fast_value(4i64);
         assert!(term_stream.advance());
         assert_eq!(term_stream.key(), json_term_writer.term().value_bytes());
 
@@ -613,7 +613,7 @@ mod tests {
 
         json_term_writer.pop_path_segment();
         json_term_writer.push_path_segment("unsigned");
-        json_term_writer.set_fast_value(1u64);
+        json_term_writer.set_fast_value(1i64);
         assert!(term_stream.advance());
         assert_eq!(term_stream.key(), json_term_writer.term().value_bytes());
         assert!(!term_stream.advance());