diff --git a/lib/grade/grade_grade.php b/lib/grade/grade_grade.php
index b1fa4d985cf..f23fd243205 100644
--- a/lib/grade/grade_grade.php
+++ b/lib/grade/grade_grade.php
@@ -715,8 +715,9 @@ class grade_grade extends grade_object {
         return $this->finalgrade >= $this->grade_item->gradepass;
     }
 
-    function insert($source=null) { 
-        $this->timecreated = $this->timemodified = time(); 
+    function insert($source=null) {
+        // TODO: dategraded hack - do not update times, they are used for submission and grading  
+        //$this->timecreated = $this->timemodified = time(); 
         return parent::insert($source);
     }
 
diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php
index e70d535faac..9863ed8893f 100644
--- a/lib/grade/grade_item.php
+++ b/lib/grade/grade_item.php
@@ -1538,8 +1538,8 @@ class grade_item extends grade_object {
             $grade->finalgrade = $this->adjust_raw_grade($grade->rawgrade, $grade->rawgrademin, $grade->rawgrademax);
         }
 
-        if (is_null($grade->rawgrade)) {
-            $grade->timemodified = null; // dategraded hack - not graded if no grade present, comments do not count here as grading
+        if (is_null($grade->rawgrade) and is_null($grade->feedback)) {
+            $grade->timemodified = null; //TODO: dategraded hack - feedback counts as grading too ;-)
         }
 
         if (empty($grade->id)) {