diff --git a/calculator/calculator.app.js b/calculator/calculator.app.js
index a8bb1d1..ada3a01 100644
--- a/calculator/calculator.app.js
+++ b/calculator/calculator.app.js
@@ -364,6 +364,8 @@ function buttonPress(val) {
         operator = null;
         prevExpression = null;
         currExpression = "";
+        angleMode = 'deg';
+        scientificOperators.angleMode.val = angleMode;
       } else {
         specials.R.val = 'AC';
         drawKey('R', specials.R, true);
@@ -388,7 +390,7 @@ function buttonPress(val) {
         displayOutput(results);
         prevExpression = "sqrt(" + prevExpression + ")";
       } else if (currNumber != null) {
-        currNumber = Math.sqrt(currNumber);
+        currNumber = Math.sqrt(parseFloat(currNumber));
         displayOutput(currNumber);
         currExpression = "sqrt(" + currExpression + ")";
       }