diff --git a/Operand.cpp b/Operand.cpp
index 67887ea..6fc7ca9 100644
--- a/Operand.cpp
+++ b/Operand.cpp
@@ -64,6 +64,11 @@ namespace jet {
 	    Operand op(parm1.string, tag);
 	    string = op.string;
 	    isNumber = op.isNumber;
+	    if(isNumber) {		 
+	       doubleValue = op.doubleValue;
+	       string = std::format("{:.12f}", doubleValue);
+	       string.removeTrailingZeros();	 	       
+	    }	    
 	    boolean = op.boolean;	    
 	 } else
 	   throw coreutils::Exception("Expecting ) at end of EXPR expression.");	 	 
diff --git a/tests/debug.jet b/tests/debug.jet
deleted file mode 100755
index 6ce13a9..0000000
--- a/tests/debug.jet
+++ /dev/null
@@ -1,5 +0,0 @@
-#!../jet-2.0
-<jet name1="localname" filterblanklines="true" trimlines="true">
-<set name="result" expr="2 + 2 * 3 + 2" />
-$[result]=10
-</jet>
diff --git a/tests/testdb.jet b/tests/testdb.jet
index a4388c4..97642a0 100755
--- a/tests/testdb.jet
+++ b/tests/testdb.jet
@@ -1,6 +1,6 @@
 #!../jet-2.0
 <jet cgi="true" name1="localname" filterblanklines="true" trimlines="true">
- <mysql host="localhost" database="barant" user="barant" password="uversa" sessionid="1">
+ <mysql host="barant.com" database="barant" user="barant" password="uversa" sessionid="1">
   <sql sessionid="1">select * from testdata</sql>
   <whilerow name="index" count="10" sessionid="1">
    $[1.id] $[1.text] $[1.value]
diff --git a/tests/testexpr.jet b/tests/testexpr.jet
index f1be169..ed98ae6 100755
--- a/tests/testexpr.jet
+++ b/tests/testexpr.jet
@@ -23,4 +23,6 @@ $[result]=45
 $[result]=45
 <set name="result" expr="2 + 2 * 3 + 2" />
 $[result]=10
+<set name="result" expr="expr(2 + 2 * 3 + 2)" />
+$[result]=10
 </jet>