diff --git a/Controls/MavlinkNumericUpDown.cs b/Controls/MavlinkNumericUpDown.cs
index 8c0426b07a..11e28a19cb 100644
--- a/Controls/MavlinkNumericUpDown.cs
+++ b/Controls/MavlinkNumericUpDown.cs
@@ -84,8 +84,8 @@ public void setup(float Min, float Max, float Scale, float Increment, string[] p
                     Increment = (float) Inc;
 
             _scale = Scale;
-            this.Minimum = (decimal)(Min);
-            this.Maximum = (decimal)(Max);
+            this.Minimum = (decimal)(Min / _scale);
+            this.Maximum = (decimal)(Max / _scale);
             this.Increment = (decimal)(Increment);
             this.DecimalPlaces = BitConverter.GetBytes(decimal.GetBits((decimal)Increment)[3])[2];