diff --git a/lib/less/functions/types.js b/lib/less/functions/types.js
index 5bf63ad36..f1706d3b2 100644
--- a/lib/less/functions/types.js
+++ b/lib/less/functions/types.js
@@ -85,5 +85,8 @@ functionRegistry.addMultiple({
     },
     length: function(values) {
         return new Dimension(getItemsFromNode(values).length);
+    },
+    _SELF: function(n) {
+        return n;
     }
 });
diff --git a/lib/less/tree/variable.js b/lib/less/tree/variable.js
index bfa049de4..9ead289c4 100644
--- a/lib/less/tree/variable.js
+++ b/lib/less/tree/variable.js
@@ -1,4 +1,5 @@
-var Node = require('./node');
+var Node = require('./node'),
+    Call = require('./call');
 
 var Variable = function (name, index, currentFileInfo) {
     this.name = name;
@@ -30,7 +31,13 @@ Variable.prototype.eval = function (context) {
                 var importantScope = context.importantScope[context.importantScope.length - 1];
                 importantScope.important = v.important;
             }
-            return v.value.eval(context);
+            // If in calc, wrap vars in a function call to cascade evaluate args first
+            if (context.inCalc) {
+                return (new Call('_SELF', [v.value])).eval(context);
+            }
+            else {
+                return v.value.eval(context);
+            }
         }
     });
     if (variable) {
diff --git a/test/css/calc.css b/test/css/calc.css
index ec8b7c933..e8b5dcc97 100644
--- a/test/css/calc.css
+++ b/test/css/calc.css
@@ -1,4 +1,6 @@
 .no-math {
+  root: calc(100% - 30px);
+  root2: calc(100% - 40px);
   width: calc(50% + (25vh - 20px));
   height: calc(50% + (25vh - 20px));
   min-height: calc((10vh) + calc(5vh));
diff --git a/test/less/calc.less b/test/less/calc.less
index fb9d21d88..53142290a 100644
--- a/test/less/calc.less
+++ b/test/less/calc.less
@@ -1,4 +1,9 @@
+@val: 10px;
 .no-math {
+  @c: 10px + 20px;
+  @calc: (@val + 30px);
+  root: calc(100% - @c);
+  root2: calc(100% - @calc);
   @var: 50vh/2;
   width: calc(50% + (@var - 20px));
   height: calc(50% + ((@var - 20px)));