diff --git a/internal/server/scanner.go b/internal/server/scanner.go
index 0bb877ee..994ec82e 100644
--- a/internal/server/scanner.go
+++ b/internal/server/scanner.go
@@ -399,14 +399,14 @@ func (sw *scanWriter) writeObject(opts ScanWriterParams) bool {
 				}
 
 			} else if len(sw.farr) > 0 {
-				fvs := orderFields(sw.fmap, sw.farr, opts.fields)
 				jsfields = `,"fields":[`
-				for i, fv := range fvs {
+				for i, name := range sw.farr {
 					if i > 0 {
 						jsfields += `,`
 					}
-					if len(opts.fields) > i {
-						jsfields += strconv.FormatFloat(fv.value, 'f', -1, 64)
+					j := sw.fmap[name]
+					if j < len(opts.fields) {
+						jsfields += strconv.FormatFloat(opts.fields[j], 'f', -1, 64)
 					} else {
 						jsfields += "0"
 					}