diff --git a/packages/node_modules/@node-red/nodes/core/function/16-range.html b/packages/node_modules/@node-red/nodes/core/function/16-range.html
index 21019703d..a9c508a02 100644
--- a/packages/node_modules/@node-red/nodes/core/function/16-range.html
+++ b/packages/node_modules/@node-red/nodes/core/function/16-range.html
@@ -64,6 +64,14 @@
         },
         inputs: 1,
         outputs: 1,
+        inputLabels: function() { return this.minin + " - " + this.maxin },
+        outputLabels: function(i) {
+            var outie = this.minout + " - " + this.maxout
+            if (this.action === "clamp") { outie = "[" + outie + "]" }
+            if (this.action === "drop") { outie = "x" + outie + "x" }
+            if (this.action === "roll") { outie = ">" + outie + ">" }
+            return outie;
+        },
         icon: "range.svg",
         label: function() {
             if (this.minout !== "" && this.maxout !== "") { return this.name||this.minout + " - " + this.maxout; }
diff --git a/packages/node_modules/@node-red/nodes/core/function/16-range.js b/packages/node_modules/@node-red/nodes/core/function/16-range.js
index 3071cd99a..10affbdc7 100644
--- a/packages/node_modules/@node-red/nodes/core/function/16-range.js
+++ b/packages/node_modules/@node-red/nodes/core/function/16-range.js
@@ -24,6 +24,14 @@ module.exports = function(RED) {
         this.maxin = Number(n.maxin);
         this.minout = Number(n.minout);
         this.maxout = Number(n.maxout);
+        if (this.minin > this.maxin) {
+            let tmp = this.minin;
+            this.minin = this.maxin;
+            this.maxin = tmp;
+            tmp = this.minout;
+            this.minout = this.maxout;
+            this.maxout = tmp;
+        }
         if (this.round) {
             this.maxout = Math.floor(this.maxout);
             this.minout = Math.ceil(this.minout);
diff --git a/test/nodes/core/function/16-range_spec.js b/test/nodes/core/function/16-range_spec.js
index 5bc8cbc32..cef16da98 100644
--- a/test/nodes/core/function/16-range_spec.js
+++ b/test/nodes/core/function/16-range_spec.js
@@ -114,6 +114,14 @@ describe('range Node', function() {
         genericRangeTest("clamp", 0, 9.5, 0.3, 100.5, true, -13.1, 1, done);
     });
 
+    it('handles input range where max < min', function(done) {
+        genericRangeTest("scale", 100, 0, 0, -100, false, 40, -60, done);
+    });
+
+    it('handles input range where max < min', function(done) {
+        genericRangeTest("scale", 100, 0, -100, 0, false, 10, -10, done);
+    });
+
     it('drops msg if in drop mode and input outside range', function(done) {
         var flow = [{"id":"rangeNode1","type":"range","minin":2,"maxin":8,"minout":20,"maxout":80,"action":"drop","round":true,"name":"rangeNode","wires":[["helperNode1"]]},
                     {id:"helperNode1", type:"helper", wires:[]}];