diff --git a/bqst-core/src/qty.rs b/bqst-core/src/qty.rs
index 02d7343..8709283 100644
--- a/bqst-core/src/qty.rs
+++ b/bqst-core/src/qty.rs
@@ -24,8 +24,8 @@ impl Display for Qty {
                 return (n, None);
             }
 
-            if n > PrecDec::from(1000) {
-                while n > PrecDec::from(1000) && i + 1 < BIG_PREFS.len() {
+            if n >= PrecDec::from(1000) {
+                while n >= PrecDec::from(1000) && i + 1 < BIG_PREFS.len() {
                     i += 1;
                     n /= PrecDec::from(1000);
                 }
@@ -52,7 +52,7 @@ impl Display for Qty {
             normalize_num(self.n.clone())
         };
 
-        if n != PrecDec::from(1) || is_none_unit {
+        if n != PrecDec::from(1) || is_none_unit || pref.is_some() {
             let flt = n.to_f64().value();
             Display::fmt(&flt, f)?;