diff --git a/process/ClassificationUpdate_lib/process.js b/process/ClassificationUpdate_lib/process.js
index 240b8f9ecb27dc7006dacc28feaa546b52b94c77..e9636d4bd9950f968dd9b007e64d2ca012a33eaf 100644
--- a/process/ClassificationUpdate_lib/process.js
+++ b/process/ClassificationUpdate_lib/process.js
@@ -677,18 +677,24 @@ ClassificationUpdateHelper._getEntityFields = function(pCurrentObjectType)
                         || pClassificationTypes[type]["fieldType"] == $ClassificationFieldTypes.DATE())
                     {
                         var numberValue;
+                        var valueForDisplayValue;
+                        var isDate = false;
                         if (pClassificationTypes[type]["fieldType"] == $ClassificationFieldTypes.DATE())
                         {
-                            numberValue = ClassificationUpdateHelper._getCorrectNumberValue(false, pClassificationTypes[type], false, null, parseInt(achievedValueArray), true);
+                            valueForDisplayValue = numberValue["key"].toString();
+                            isDate = true;
                         }
                         else
                         {
-                            numberValue = ClassificationUpdateHelper._getCorrectNumberValue(false, pClassificationTypes[type], false, null, parseInt(achievedValueArray));
+                            valueForDisplayValue = parseInt(achievedValueArray).toString();
                         }
-
+                        
+                        numberValue = ClassificationUpdateHelper._getCorrectNumberValue(false, pClassificationTypes[type], false, null, parseInt(achievedValueArray), isDate);
+                        pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["value"] = $ClassificationComplexIndicatorRegistry[pClassificationTypes[type]["field"]]().getDisplayValueFn(valueForDisplayValue);
+                        
                         pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["key"] = numberValue["key"];
 
-                        pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["value"] = $ClassificationComplexIndicatorRegistry[pClassificationTypes[type]["field"]]().getDisplayValueFn(numberValue["key"].toString());
+                        
 
                         pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["maxPoints"] = numberValue["maxPoints"];
                         pAchievedScoresObject[pUid][pClassificationTypes[type]["classificationGroupId"]][type]["points"] = numberValue["points"];