diff --git a/debian/changelog b/debian/changelog
index 5af18324..132561bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hedera-web (1.407.37) stable; urgency=low
+hedera-web (1.407.38) stable; urgency=low
 
   * Initial Release.
 
diff --git a/js/htk/field/calendar.js b/js/htk/field/calendar.js
index c024feb6..0a1eb085 100644
--- a/js/htk/field/calendar.js
+++ b/js/htk/field/calendar.js
@@ -214,7 +214,6 @@ module.exports = new Class({
 	
 		if (cell.enabled) {
 			this.selectCell(cellIndex);
-
 			var newDate = new Date(this.year, this.month, cell.day);
 
 			if (this.value) {
@@ -222,12 +221,13 @@ module.exports = new Class({
 					? this.value
 					: new Date(this.value);
 
-				newDate.setHours(
-					orgDate.getHours(),
-					orgDate.getMinutes(),
-					orgDate.getSeconds(),
-					orgDate.getMilliseconds()
-				);
+				if (!isNaN(orgDate.getTime()))
+					newDate.setHours(
+						orgDate.getHours(),
+						orgDate.getMinutes(),
+						orgDate.getSeconds(),
+						orgDate.getMilliseconds()
+					);
 			}
 
 			this.valueChanged(newDate);
diff --git a/package.json b/package.json
index 851552dc..740f2ed8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hedera-web",
-  "version": "1.407.37",
+  "version": "1.407.38",
   "description": "Verdnatura web page",
   "license": "GPL-3.0",
   "repository": {